From 84aaae13ab49d78b1eaba073dc1da491add2681f Mon Sep 17 00:00:00 2001 From: Richard Perdaan Date: Wed, 31 Jul 2024 11:38:12 +0200 Subject: [PATCH] feat: small package belgium (#859) --- Model/Sales/Repository/PackageRepository.php | 3 +-- Ui/Component/Listing/Column/TrackActions.php | 26 ++++++++++++++------ i18n/fr_FR.csv | 1 + i18n/nl_NL.csv | 1 + 4 files changed, 22 insertions(+), 9 deletions(-) diff --git a/Model/Sales/Repository/PackageRepository.php b/Model/Sales/Repository/PackageRepository.php index 01b55305..ee2e0a53 100755 --- a/Model/Sales/Repository/PackageRepository.php +++ b/Model/Sales/Repository/PackageRepository.php @@ -324,8 +324,7 @@ public function setPackageSmallSettings(string $carrierPath = self::XML_PATH_POS */ private function fitInPackageSmall(): bool { - return AbstractConsignment::CC_BE !== $this->getCurrentCountry() - && $this->isPackageSmallActive() + return $this->isPackageSmallActive() && $this->getWeight() <= $this->getMaxPackageSmallWeight(); } diff --git a/Ui/Component/Listing/Column/TrackActions.php b/Ui/Component/Listing/Column/TrackActions.php index 9a4692dc..5a6b1920 100755 --- a/Ui/Component/Listing/Column/TrackActions.php +++ b/Ui/Component/Listing/Column/TrackActions.php @@ -89,7 +89,7 @@ public function prepareDataSource(array $dataSource) 'hidden' => ! $orderManagementActivated, ]; } else { - $item[$this->getData('name')]['action-download_package_label'] = [ + $item[$this->getData('name')]['action-download_package_label'] = [ 'href' => $this->urlBuilder->getUrl( 'myparcel/order/CreateAndPrintMyParcelTrack', [ @@ -101,6 +101,18 @@ public function prepareDataSource(array $dataSource) 'label' => __('Download package label'), 'hidden' => $orderManagementActivated, ]; + $item[$this->getData('name')]['action-download_small_package_label'] = [ + 'href' => $this->urlBuilder->getUrl( + 'myparcel/order/CreateAndPrintMyParcelTrack', + [ + 'selected_ids' => $item['entity_id'], + 'mypa_package_type' => 6, + 'mypa_request_type' => 'download', + ] + ), + 'label' => __('Download small package label'), + 'hidden' => $orderManagementActivated, + ]; $item[$this->getData('name')]['action-download_digital_stamp_label'] = [ 'href' => $this->urlBuilder->getUrl( 'myparcel/order/CreateAndPrintMyParcelTrack', @@ -113,7 +125,7 @@ public function prepareDataSource(array $dataSource) 'label' => __('Download digital stamp label'), 'hidden' => $orderManagementActivated, ]; - $item[$this->getData('name')]['action-download_mailbox_label'] = [ + $item[$this->getData('name')]['action-download_mailbox_label'] = [ 'href' => $this->urlBuilder->getUrl( 'myparcel/order/CreateAndPrintMyParcelTrack', [ @@ -125,7 +137,7 @@ public function prepareDataSource(array $dataSource) 'label' => __('Download mailbox label'), 'hidden' => $orderManagementActivated, ]; - $item[$this->getData('name')]['action-download_letter_label'] = [ + $item[$this->getData('name')]['action-download_letter_label'] = [ 'href' => $this->urlBuilder->getUrl( 'myparcel/order/CreateAndPrintMyParcelTrack', [ @@ -137,7 +149,7 @@ public function prepareDataSource(array $dataSource) 'label' => __('Download letter label'), 'hidden' => $orderManagementActivated, ]; - $item[$this->getData('name')]['action-create_concept'] = [ + $item[$this->getData('name')]['action-create_concept'] = [ 'href' => $this->urlBuilder->getUrl( 'myparcel/order/CreateAndPrintMyParcelTrack', [ @@ -148,7 +160,7 @@ public function prepareDataSource(array $dataSource) 'label' => __('Create new concept'), 'hidden' => $orderManagementActivated, ]; - $item[$this->getData('name')]['action-ship_direct'] = [ + $item[$this->getData('name')]['action-ship_direct'] = [ 'href' => $this->urlBuilder->getUrl( 'adminhtml/order_shipment/start', [ @@ -162,7 +174,7 @@ public function prepareDataSource(array $dataSource) } if (isset($item[ShippingStatus::NAME])) { - $item[$this->getData('name')]['action-create_concept'] = [ + $item[$this->getData('name')]['action-create_concept'] = [ 'href' => $this->urlBuilder->getUrl( 'myparcel/order/CreateAndPrintMyParcelTrack', [ @@ -173,7 +185,7 @@ public function prepareDataSource(array $dataSource) 'label' => __('Already exported'), 'hidden' => ! $orderManagementActivated, ]; - $item[$this->getData('name')]['action-download_package_label'] = [ + $item[$this->getData('name')]['action-download_package_label'] = [ 'href' => $this->urlBuilder->getUrl( 'myparcel/order/CreateAndPrintMyParcelTrack', [ diff --git a/i18n/fr_FR.csv b/i18n/fr_FR.csv index 511bb5df..88a64165 100644 --- a/i18n/fr_FR.csv +++ b/i18n/fr_FR.csv @@ -89,6 +89,7 @@ Home address only,Livraison à domicile uniquement Hide sender title,Titre de masquer l'expéditeur Insured up to:,Assuré jusqu'à : Download package label,Télécharger l'étiquette du colis +Download small package label,Télécharger l'étiquette du petit colis Create new concept,Créer une nouveau concept Create shipment,Créer un envoi Please select an item from the list,Sélectionnez une commande dans la liste diff --git a/i18n/nl_NL.csv b/i18n/nl_NL.csv index 7c9c5dcb..220368ce 100755 --- a/i18n/nl_NL.csv +++ b/i18n/nl_NL.csv @@ -144,6 +144,7 @@ MyParcel options,MyParcel opties Package,Pakket Insured up to:,Verzekeren tot: Download package label,Download pakket label +Download small package label,Download klein pakket label Download digital stamp label,Download digitalepostzegel label Download mailbox label,Download brievenbuspakje label Download letter label,Download ongefrankeerd label