Pes 284 multi weight edit fix (#33)

* PES-284: multi order weight edit - readme.md update * PES-284: multi order weight edit - filter form reset fix * PES-284: multi order weight edit - CR
Zasilkovna · Aug 31, 2021 · 687acf8 · 687acf8
1 parent d5dc5f2
commit 687acf8
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 
 ## Download link
 
-[Download version 2.0.4](https://github.com/Zasilkovna/opencart3/releases/download/v2.0.4/opencart3-modul-2.0.4.ocmod.zip)
+[Download version 2.1.0](https://github.com/Zasilkovna/opencart3/releases/download/v2.1.0/opencart3-modul-2.1.0.ocmod.zip)
 
 ### Information about the module
 
@@ -23,14 +23,15 @@
 - setting prices according to weighting rules
 - traffic tax and GEO zone settings
 - free shipping from the specified price or weight of the order
+- possibility of bulk weight adjustment in the shipment list
 - export shipments to a csv file that can be imported in the client section
 - Journal 3 one page checkout support
 
 # Modul pro Opencart 3
 
 ### Stažení modulu
 
-[Aktuální verze 2.0.4](https://github.com/Zasilkovna/opencart3/releases/download/v2.0.4/opencart3-modul-2.0.4.ocmod.zip)
+[Aktuální verze 2.1.0](https://github.com/Zasilkovna/opencart3/releases/download/v2.1.0/opencart3-modul-2.1.0.ocmod.zip)
 
 ### Informace o modulu
 
@@ -52,5 +53,6 @@
 - nastavení cen podle váhových pravidel
 - nastavení daně dopravy a GEO zóny
 - doprava zdarma od zadané ceny nebo hmotnosti objednávky
+- možnost hromadné úpravy hmotnosti v seznamu zásilek
 - export zásilek do csv souboru, který lze importovat v [klientské sekci](https://client.packeta.com/)
 - podpora jednokrokového košíku Journal 3
diff --git a/upload/admin/controller/extension/shipping/zasilkovna.php b/upload/admin/controller/extension/shipping/zasilkovna.php
@@ -1020,7 +1020,23 @@ public function orders_update() {
 		}
 
 		$this->session->data[self::TEMPLATE_MESSAGE_SUCCESS] = $this->language->get('orders_updated');
-		$this->response->redirect($this->createAdminLink('orders'));
+		$this->response->redirect($this->createAdminLink('orders', $this->getAdminLinkUrlParameters()));
+	}
+
+	/**
+	 * @return array
+	 */
+	private function getAdminLinkUrlParameters() {
+		$getParameters = $this->request->get;
+		unset($getParameters['user_token'], $getParameters['route']);
+
+		foreach ($getParameters as $getParameterKey => &$getParameter) {
+			if ($getParameter === '') {
+				unset($getParameters[$getParameterKey]);
+			}
+		}
+
+		return $getParameters;
 	}
 
 	/**