← All changes | modules/global-classes/import-export-customization/runners/import.php +1 -30 4.0.9 → 4.0.0-beta1 View file →

		@@ -45,13 +45,8 @@
45	45	if ( ! $kit || ! $global_classes ) {
46	46	return [];
47	47	}
48	48
49		- $global_classes['order'] = Global_Classes_Parser::sanitize_order(
50		- $global_classes['items'] ?? [],
51		- $global_classes['order'] ?? []
52		- );
53		-
54	49	$global_classes_result = Global_Classes_Parser::make()->parse( $global_classes );
55	50
56	51	if ( ! $global_classes_result->is_valid() ) {
57	52	return [];
		@@ -70,9 +65,9 @@
70	65
71	66	return $imported_classes;
72	67	}
73	68
74		- $existing_classes = $this->get_existing_classes( $repository, $imported_data );
	69	+ $existing_classes = $repository->all()->get();
75	70	$merged = $this->merge_classes( $existing_classes, $imported_classes );
76	71
77	72	$repository->put(
78	73	$merged['items'],
		@@ -79,32 +74,8 @@
79	74	$merged['order']
80	75	);
81	76
82	77	return $imported_classes;
83		- }
84		-
85		- private function get_existing_classes( Global_Classes_Repository $repository, array $imported_data ): array {
86		- $existing = $repository->all()->get();
87		-
88		- if ( ! empty( $existing['items'] ) ) {
89		- return $existing;
90		- }
91		-
92		- $was_new_kit_created = ! empty( $imported_data['site-settings']['imported_kit_id'] );
93		-
94		- if ( ! $was_new_kit_created ) {
95		- return $existing;
96		- }
97		-
98		- $previous_kit_id = Plugin::$instance->kits_manager->get_previous_id();
99		-
100		- if ( ! $previous_kit_id ) {
101		- return $existing;
102		- }
103		-
104		- $previous_kit = Plugin::$instance->kits_manager->get_kit( $previous_kit_id );
105		-
106		- return Global_Classes_Repository::make( $previous_kit )->all()->get();
107	78	}
108	79
109	80	private function merge_classes( array $existing, array $imported ): array {
110	81	$existing_items = $existing['items'] ?? [];