diff --git a/app/code/community/TIG/MyParcel2014/Block/Adminhtml/Sales/Order/Shipment/Create/ConsignmentOptions.php b/app/code/community/TIG/MyParcel2014/Block/Adminhtml/Sales/Order/Shipment/Create/ConsignmentOptions.php index 54c18c79..e584b814 100755 --- a/app/code/community/TIG/MyParcel2014/Block/Adminhtml/Sales/Order/Shipment/Create/ConsignmentOptions.php +++ b/app/code/community/TIG/MyParcel2014/Block/Adminhtml/Sales/Order/Shipment/Create/ConsignmentOptions.php @@ -276,23 +276,23 @@ public function getIsInsured() $orderTotalShipped = $this->getOrderTotal(); //get the insured values - $insuredType50 = $helper->getConfig('insured_50', 'shipment', $storeId); + $insuredType100 = $helper->getConfig('insured_100', 'shipment', $storeId); $insuredType250 = $helper->getConfig('insured_250', 'shipment', $storeId); $insuredType500 = $helper->getConfig('insured_500', 'shipment', $storeId); //check if the values are not empty/zero - $insuredType50 = (!empty($insuredType50) && $insuredType50 > 0)? $insuredType50 : false; + $insuredType100 = (!empty($insuredType100) && $insuredType100 > 0)? $insuredType100 : false; $insuredType250 = (!empty($insuredType250) && $insuredType250 > 0)? $insuredType250 : false; $insuredType500 = (!empty($insuredType500) && $insuredType500 > 0)? $insuredType500 : false; //if nothing is filled in, then set the default values, but do not pre-select $selected = 'checked="checked"'; if( - false === $insuredType50 && + false === $insuredType100 && false === $insuredType250 && false === $insuredType500 ){ - $insuredType50 = 50; + $insuredType100 = 100; $insuredType250 = 250; $insuredType500 = 500; $selected = 0; @@ -304,9 +304,9 @@ public function getIsInsured() }elseif(false !== $insuredType250 && $orderTotalShipped > $insuredType250){ $insuredValue = $insuredType250; $insuredUpTo = 250; - }elseif(false !== $insuredType50 && $orderTotalShipped > $insuredType50){ - $insuredValue = $insuredType50; - $insuredUpTo = 50; + }elseif(false !== $insuredType100 && $orderTotalShipped > $insuredType100){ + $insuredValue = $insuredType100; + $insuredUpTo = 100; }else{ $insuredValue = 0; $insuredUpTo = 0; diff --git a/app/code/community/TIG/MyParcel2014/Block/Adminhtml/Sales/Order/Shipment/ShippingInfo.php b/app/code/community/TIG/MyParcel2014/Block/Adminhtml/Sales/Order/Shipment/ShippingInfo.php index ca13a382..e9e6e4f0 100755 --- a/app/code/community/TIG/MyParcel2014/Block/Adminhtml/Sales/Order/Shipment/ShippingInfo.php +++ b/app/code/community/TIG/MyParcel2014/Block/Adminhtml/Sales/Order/Shipment/ShippingInfo.php @@ -286,23 +286,23 @@ public function getIsInsured() $orderTotalShipped = $this->getOrderTotal(); //get the insured values - $insuredType50 = $helper->getConfig('insured_50', 'shipment', $storeId); + $insuredType100 = $helper->getConfig('insured_100', 'shipment', $storeId); $insuredType250 = $helper->getConfig('insured_250', 'shipment', $storeId); $insuredType500 = $helper->getConfig('insured_500', 'shipment', $storeId); //check if the values are not empty/zero - $insuredType50 = (!empty($insuredType50) && $insuredType50 > 0)? $insuredType50 : false; + $insuredType100 = (!empty($insuredType100) && $insuredType100 > 0)? $insuredType100 : false; $insuredType250 = (!empty($insuredType250) && $insuredType250 > 0)? $insuredType250 : false; $insuredType500 = (!empty($insuredType500) && $insuredType500 > 0)? $insuredType500 : false; //if nothing is filled in, then set the default values, but do not pre-select $selected = 'checked="checked"'; if( - false === $insuredType50 && + false === $insuredType100 && false === $insuredType250 && false === $insuredType500 ){ - $insuredType50 = 50; + $insuredType100 = 100; $insuredType250 = 250; $insuredType500 = 500; $selected = 0; @@ -314,9 +314,9 @@ public function getIsInsured() }elseif(false !== $insuredType250 && $orderTotalShipped > $insuredType250){ $insuredValue = $insuredType250; $insuredUpTo = 250; - }elseif(false !== $insuredType50 && $orderTotalShipped > $insuredType50){ - $insuredValue = $insuredType50; - $insuredUpTo = 50; + }elseif(false !== $insuredType100 && $orderTotalShipped > $insuredType100){ + $insuredValue = $insuredType100; + $insuredUpTo = 100; }else{ $insuredValue = 0; $insuredUpTo = 0; diff --git a/app/code/community/TIG/MyParcel2014/Block/Adminhtml/Sales/Order/View/ShippingInfo.php b/app/code/community/TIG/MyParcel2014/Block/Adminhtml/Sales/Order/View/ShippingInfo.php index b65fd774..ae8cac4e 100755 --- a/app/code/community/TIG/MyParcel2014/Block/Adminhtml/Sales/Order/View/ShippingInfo.php +++ b/app/code/community/TIG/MyParcel2014/Block/Adminhtml/Sales/Order/View/ShippingInfo.php @@ -134,15 +134,9 @@ public function getCurrentOrderOptionsHtml() /** @var $myParcelShipment TIG_MyParcel2014_Model_Shipment */ foreach ($this->_myParcelShipments as $myParcelShipment) { $shipmentUrl = Mage::helper('adminhtml')->getUrl("*/sales_shipment/view", array('shipment_id'=>$myParcelShipment->getShipment()->getId())); - $editUrl = "https://backoffice.myparcel.nl/shipmentform?shipment=" . $myParcelShipment->getConsignmentId(); - if ($myParcelShipment->getStatus() == 1) { - $editLink = '' . $this->__("Edit options") . ''; - } else { - $editLink = ''; - } $linkText = $myParcelShipment->getBarcode() ? $myParcelShipment->getBarcode() : $this->__('Shipment'); - $optionsHtml .= '

' . $linkText . ': ' . $this->_helper->getCurrentOptionsHtml($myParcelShipment) . ' ' . $editLink . '

'; + $optionsHtml .= '

' . $linkText . ': ' . $this->_helper->getCurrentOptionsHtml($myParcelShipment) .'

'; } return $optionsHtml; diff --git a/app/code/community/TIG/MyParcel2014/Helper/Data.php b/app/code/community/TIG/MyParcel2014/Helper/Data.php index dc078500..cd7f0ec8 100755 --- a/app/code/community/TIG/MyParcel2014/Helper/Data.php +++ b/app/code/community/TIG/MyParcel2014/Helper/Data.php @@ -427,7 +427,7 @@ protected function _getSplitStreetData($fullStreet, $throwException = true) if (strlen($fullStreet) > 40 && $throwException) { throw new TIG_MyParcel2014_Exception( - $this->__('Address is too long. Make the delivery address less than 40 characters. Click on send (in the order detail page) to create a concept. And then edit the shipment in the backoffice of MyParcel.'), + $this->__('Address is too long. Make the delivery address less than 40 characters. Click on send (in the order detail page) to create a concept. And then edit the shipment in the backoffice.'), 'MYPA-0026' ); } diff --git a/app/code/community/TIG/MyParcel2014/Model/Shipment.php b/app/code/community/TIG/MyParcel2014/Model/Shipment.php index 09a12f3d..1df057e6 100755 --- a/app/code/community/TIG/MyParcel2014/Model/Shipment.php +++ b/app/code/community/TIG/MyParcel2014/Model/Shipment.php @@ -453,12 +453,12 @@ public function getInsuredOption() $orderTotalShipped = $this->getOrderTotal(); //get the insured values - $insuredType50 = $helper->getConfig('insured_50','shipment',$storeId); + $insuredType100 = $helper->getConfig('insured_100','shipment',$storeId); $insuredType250 = $helper->getConfig('insured_250','shipment',$storeId); $insuredType500 = $helper->getConfig('insured_500','shipment',$storeId); //check if the values are not empty/zero. - $insuredType50 = (!empty($insuredType50) && $insuredType50 > 0)? $insuredType50 : false; + $insuredType100 = (!empty($insuredType100) && $insuredType100 > 0)? $insuredType100 : false; $insuredType250 = (!empty($insuredType250) && $insuredType250 > 0)? $insuredType250 : false; $insuredType500 = (!empty($insuredType500) && $insuredType500 > 0)? $insuredType500 : false; @@ -467,8 +467,8 @@ public function getInsuredOption() $insuredValue = 500; }elseif(false !== $insuredType250 && $orderTotalShipped > $insuredType250){ $insuredValue = 250; - }elseif(false !== $insuredType50 && $orderTotalShipped > $insuredType50){ - $insuredValue = 50; + }elseif(false !== $insuredType100 && $orderTotalShipped > $insuredType100){ + $insuredValue = 100; }else{ $insuredValue = 0; } diff --git a/app/code/community/TIG/MyParcel2014/etc/config.xml b/app/code/community/TIG/MyParcel2014/etc/config.xml index 61fcde14..64b5a9cb 100755 --- a/app/code/community/TIG/MyParcel2014/etc/config.xml +++ b/app/code/community/TIG/MyParcel2014/etc/config.xml @@ -2,7 +2,7 @@ - 1.17.3-beta.1 + 1.17.3-beta.2 @@ -260,7 +260,7 @@ 0 1 0 - 0 + 0 0 0 1 diff --git a/app/code/community/TIG/MyParcel2014/etc/system.xml b/app/code/community/TIG/MyParcel2014/etc/system.xml index 3989fcd1..ae2208d4 100755 --- a/app/code/community/TIG/MyParcel2014/etc/system.xml +++ b/app/code/community/TIG/MyParcel2014/etc/system.xml @@ -750,11 +750,11 @@ 1 1 1 - To get your personal API credentials you should contact MyParcel. + To get your personal API credentials you should contact us. - Your MyParcel username. + Your username. text 10 1 @@ -763,7 +763,7 @@ - The API Key given by MyParcel. + The API Key. text adminhtml/system_config_backend_encrypted 20 @@ -922,8 +922,8 @@ 1 1 - - + + Only for dutch shipments text validate-number validate-zero-or-greater @@ -931,7 +931,7 @@ 1 1 1 - + diff --git a/app/design/adminhtml/default/default/template/TIG/MyParcel2014/sales/order/shipment/create/consignment_options.phtml b/app/design/adminhtml/default/default/template/TIG/MyParcel2014/sales/order/shipment/create/consignment_options.phtml index 1b99ac70..cc3f5fd8 100755 --- a/app/design/adminhtml/default/default/template/TIG/MyParcel2014/sales/order/shipment/create/consignment_options.phtml +++ b/app/design/adminhtml/default/default/template/TIG/MyParcel2014/sales/order/shipment/create/consignment_options.phtml @@ -110,7 +110,7 @@ if(true == $_isPakjegemak){