diff --git a/Block/Sales/NewShipmentForm.php b/Block/Sales/NewShipmentForm.php index 97f73ecf..fe542f5a 100644 --- a/Block/Sales/NewShipmentForm.php +++ b/Block/Sales/NewShipmentForm.php @@ -9,6 +9,7 @@ use MyParcelNL\Sdk\src\Model\Carrier\CarrierDPD; use MyParcelNL\Sdk\src\Model\Carrier\CarrierFactory; use MyParcelNL\Sdk\src\Model\Carrier\CarrierPostNL; +use MyParcelNL\Sdk\src\Model\Carrier\CarrierUPS; use MyParcelNL\Sdk\src\Model\Consignment\AbstractConsignment; class NewShipmentForm @@ -18,6 +19,7 @@ class NewShipmentForm CarrierDHLForYou::class, CarrierDHLEuroplus::class, CarrierDHLParcelConnect::class, + CarrierUPS::class, CarrierDPD::class, ]; diff --git a/Helper/Data.php b/Helper/Data.php index 9cf587f5..95f21f6c 100755 --- a/Helper/Data.php +++ b/Helper/Data.php @@ -14,6 +14,7 @@ use MyParcelNL\Sdk\src\Model\Carrier\CarrierDHLParcelConnect; use MyParcelNL\Sdk\src\Model\Carrier\CarrierDPD; use MyParcelNL\Sdk\src\Model\Carrier\CarrierPostNL; +use MyParcelNL\Sdk\src\Model\Carrier\CarrierUPS; use MyParcelNL\Sdk\src\Model\Consignment\AbstractConsignment; use MyParcelNL\Sdk\src\Model\Consignment\DropOffPoint; use MyParcelNL\Sdk\src\Services\CheckApiKeyService; @@ -26,6 +27,7 @@ class Data extends AbstractHelper public const XML_PATH_DHLFORYOU_SETTINGS = 'myparcelnl_magento_dhlforyou_settings/'; public const XML_PATH_DHLEUROPLUS_SETTINGS = 'myparcelnl_magento_dhleuroplus_settings/'; public const XML_PATH_DHLPARCELCONNECT_SETTINGS = 'myparcelnl_magento_dhlparcelconnect_settings/'; + public const XML_PATH_UPS_SETTINGS = 'myparcelnl_magento_ups_settings/'; public const XML_PATH_DPD_SETTINGS = 'myparcelnl_magento_dpd_settings/'; public const DEFAULT_WEIGHT = 1000; public const CARRIERS_XML_PATH_MAP = [ @@ -33,6 +35,7 @@ class Data extends AbstractHelper CarrierDHLForYou::NAME => self::XML_PATH_DHLFORYOU_SETTINGS, CarrierDHLEuroplus::NAME => self::XML_PATH_DHLEUROPLUS_SETTINGS, CarrierDHLParcelConnect::NAME => self::XML_PATH_DHLPARCELCONNECT_SETTINGS, + CarrierUPS::NAME => self::XML_PATH_UPS_SETTINGS, CarrierDPD::NAME => self::XML_PATH_DPD_SETTINGS, ]; diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml index 5dcb91b1..b55ed691 100755 --- a/etc/adminhtml/system.xml +++ b/etc/adminhtml/system.xml @@ -905,8 +905,8 @@ -
- +
+ myparcelnl_magento MyParcelNL_Magento::myparcelnl_magento @@ -916,14 +916,6 @@ Show a delivery date in the checkout. Magento\Config\Model\Config\Source\Yesno - - - - 1 - - MyParcelNL\Magento\Model\Source\NumberOfDays - Amount of days in the future customers can choose from in the checkout. - If a request is made for the delivery options between Friday after, and Monday before, cut-off time then Tuesday will be shown as the next possible delivery date. @@ -936,7 +928,7 @@ - This options allows you to set the number of days it takes you to pick, pack and hand in your parcels at PostNL when ordered before the cutoff time. + This options allows you to set the number of days it takes you to pick, pack and hand in your parcels at UPS when ordered before the cutoff time. MyParcelNL\Magento\Model\Source\DropOffDelayDays @@ -947,20 +939,6 @@ Magento\Config\Model\Config\Source\Yesno - - - - - Magento\Config\Model\Config\Source\Yesno - - - - Enter an amount that is either positive or negative. For example, do you want to give a discount for using this function or do you want to charge extra for this delivery option. - - 1 - - -
diff --git a/etc/config.xml b/etc/config.xml index e2ccb311..9292b94e 100755 --- a/etc/config.xml +++ b/etc/config.xml @@ -217,7 +217,7 @@ - + @@ -231,11 +231,7 @@ 1 - - 1 - 0 - - + diff --git a/i18n/en_US.csv b/i18n/en_US.csv index 10daa1ef..8ae980a6 100755 --- a/i18n/en_US.csv +++ b/i18n/en_US.csv @@ -44,6 +44,7 @@ myparcelnl_magento_dhlforyou_settings/delivery/only_recipient, DHL For You deliv myparcelnl_magento_dhlforyou_settings/delivery/only_recipient/signature, DHL For You delivery with only recipient and signature myparcelnl_magento_dhleuroplus_settings/delivery, DHL Europlus delivery myparcelnl_magento_dhlparcelconnect_settings/delivery, DHL Parcel Connect delivery +myparcelnl_magento_ups_settings/delivery, UPS delivery myparcelnl_magento_dpd_settings/delivery, DPD delivery myparcelnl_magento_error_no_shipments_to_process, No MyParcel shipments to process. no_account_settings, No account settings found. Press the import button in general configuration to fetch account settings. diff --git a/i18n/nl_NL.csv b/i18n/nl_NL.csv index 886cfe7f..b747a2ba 100755 --- a/i18n/nl_NL.csv +++ b/i18n/nl_NL.csv @@ -36,6 +36,7 @@ myparcelnl_magento_dhlforyou_settings/delivery/only_recipient, DHL For You bezor myparcelnl_magento_dhlforyou_settings/delivery/only_recipient/signature, DHL For You bezorging met alleen ontvanger en handtekening myparcelnl_magento_dhleuroplus_settings/delivery, DHL Europlus bezorging myparcelnl_magento_dhlparcelconnect_settings/delivery, DHL Parcel Connect bezorging +myparcelnl_magento_ups_settings.delivery, UPS bezorging myparcenl_magento_dpd_settings/delivery, DPD bezorging myparcelnl_magento_error_no_shipments_to_process, Geen MyParcel zendingen om te verwerken. Version and support,Versie en support diff --git a/package.json b/package.json index 52558544..4da1b985 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "postinstall": "node postinstall.js" }, "dependencies": { - "@myparcel/delivery-options": "^5.10.0", + "@myparcel/delivery-options": "^5.11.1", "custom-event-polyfill": "^1.0.7", "object-path": "^0.11.5" }, diff --git a/view/adminhtml/web/template/grid/order_massaction.html b/view/adminhtml/web/template/grid/order_massaction.html index 26880f5b..11ec0c69 100755 --- a/view/adminhtml/web/template/grid/order_massaction.html +++ b/view/adminhtml/web/template/grid/order_massaction.html @@ -57,9 +57,9 @@
- - + +
diff --git a/view/frontend/web/js/view/delivery-options.js b/view/frontend/web/js/view/delivery-options.js index 305ae2da..17f4524c 100644 --- a/view/frontend/web/js/view/delivery-options.js +++ b/view/frontend/web/js/view/delivery-options.js @@ -87,6 +87,7 @@ define( 'myparcelnl_magento_dhlforyou_settings/delivery/only_recipient/same_day_delivery': 'config.carrierSettings.dhlforyou.priceSameDayDeliveryAndOnlyRecipient', 'myparcelnl_magento_dhleuroplus_settings/delivery': 'config.carrierSettings.dhleuroplus.priceStandardDelivery', 'myparcelnl_magento_dhlparcelconnect_settings/delivery': 'config.carrierSettings.dhlparcelconnect.priceStandardDelivery', + 'myparcelnl_magento_ups_settings/delivery': 'config.carrierSettings.ups.priceStandardDelivery', 'myparcelnl_magento_dpd_settings/delivery': 'config.carrierSettings.dpd.priceStandardDelivery', 'myparcelnl_magento_dpd_settings/pickup': 'config.carrierSettings.dpd.pricePickup', },