diff --git a/app/code/community/TIG/MyParcel2014/Helper/Data.php b/app/code/community/TIG/MyParcel2014/Helper/Data.php index 77570a9b..6269ea2d 100755 --- a/app/code/community/TIG/MyParcel2014/Helper/Data.php +++ b/app/code/community/TIG/MyParcel2014/Helper/Data.php @@ -226,7 +226,7 @@ public function shippingMethodIsPakjegemak($method) $myParcelCarrier = Mage::getModel('tig_myparcel/carrier_myParcel'); $myParcelCode = $myParcelCarrier->getCarrierCode(); - if ($method == $myParcelCode . '_pakjegemak' || $method == $myParcelCode . '_pickup' || $method == $myParcelCode . '_pickup_express') { + if ($method == $myParcelCode . '_pakjegemak' || $method == $myParcelCode . '_pickup') { return true; } @@ -1197,7 +1197,6 @@ public function getExtraPrice($method, $price) $eveningFee = (float)$this->getConfig('eveningdelivery_fee', 'eveningdelivery'); $signatureAndOnlyRecipient = (float)$this->getConfig('signature_and_only_recipient_fee', 'delivery'); $pickupFee = (float)$this->getConfig('pickup_fee', 'pickup'); - $pickupExpressFee = (float)$this->getConfig('pickup_express_fee', 'pickup_express'); $mailboxFee = (float)$this->getConfig('mailbox_fee', 'mailbox'); switch ($method) { @@ -1227,9 +1226,6 @@ public function getExtraPrice($method, $price) case ('pickup'): $price += $pickupFee; break; - case ('pickup_express'): - $price += $pickupExpressFee; - break; case ('mailbox'): $price = $mailboxFee; break; diff --git a/app/code/community/TIG/MyParcel2014/Model/Carrier/MyParcel.php b/app/code/community/TIG/MyParcel2014/Model/Carrier/MyParcel.php index 1d7d2fdc..b7673f17 100755 --- a/app/code/community/TIG/MyParcel2014/Model/Carrier/MyParcel.php +++ b/app/code/community/TIG/MyParcel2014/Model/Carrier/MyParcel.php @@ -167,7 +167,6 @@ public function getAllowedMethods() 'evening' => $helper->__('TYPE_night'), 'evening_signature' => $helper->__('TYPE_night') . ' (' . $signatureTitle . ')', 'pickup' => $helper->getConfig('pickup_title', 'pickup'), - 'pickup_express' => $helper->getConfig('pickup_title', 'pickup') . ' (' . strtolower($helper->__('TYPE_retailexpress')) . ')', 'flatrate' => $this->getConfigData('name') . ' flat', 'tablerate' => $this->getConfigData('name') . ' table', 'mailbox' => $helper->getConfig('mailbox_title', 'mailbox'), @@ -230,7 +229,6 @@ public function collectRates(Mage_Shipping_Model_Rate_Request $request) $this->addShippingRate($result, 'morning_delivery', 'morning_delivery', 'morning_signature'); $this->addShippingRate($result, 'eveningdelivery', 'eveningdelivery', 'evening'); $this->addShippingRate($result, 'eveningdelivery', 'eveningdelivery', 'evening_signature'); - $this->addShippingRate($result, 'pickup_express', 'pickup_express', 'pickup_express'); } return $result; diff --git a/app/code/community/TIG/MyParcel2014/controllers/CheckoutController.php b/app/code/community/TIG/MyParcel2014/controllers/CheckoutController.php index 5385e2d0..f55b61d1 100755 --- a/app/code/community/TIG/MyParcel2014/controllers/CheckoutController.php +++ b/app/code/community/TIG/MyParcel2014/controllers/CheckoutController.php @@ -145,10 +145,6 @@ public function infoAction() } $data['pickup'] = (object)$pickup; - $pickupExpress['active'] = $helper->getConfig('pickup_express_active', 'pickup_express') == "1" && $data['address']['country'] == self::CC_NL ? true : false; - $pickupExpress['fee'] = $this->getExtraPrice($basePrice, $this->getShippingPrice($helper->getConfig('pickup_express_fee', 'pickup_express'), $quote)); - $data['pickupExpress'] = (object)$pickupExpress; - $info = array( 'version' => (string) Mage::getConfig()->getModuleConfig("TIG_MyParcel2014")->version, 'data' => (object)$data @@ -158,7 +154,7 @@ public function infoAction() echo(json_encode($info)); exit; } - + /** * Save the MyParcel data in quote diff --git a/app/code/community/TIG/MyParcel2014/etc/config.xml b/app/code/community/TIG/MyParcel2014/etc/config.xml index 7f4f25ed..8d49b5da 100755 --- a/app/code/community/TIG/MyParcel2014/etc/config.xml +++ b/app/code/community/TIG/MyParcel2014/etc/config.xml @@ -2,7 +2,7 @@ - 1.18.2 + 1.19.0 @@ -310,10 +310,6 @@ Ophalen bij een PostNL locatie 0 - - 1 - 1.38 - Bezorgen Standaard levering diff --git a/app/code/community/TIG/MyParcel2014/etc/system.xml b/app/code/community/TIG/MyParcel2014/etc/system.xml index 3a2578f8..14695e12 100755 --- a/app/code/community/TIG/MyParcel2014/etc/system.xml +++ b/app/code/community/TIG/MyParcel2014/etc/system.xml @@ -631,50 +631,6 @@ - - - 20 - 1 - 1 - 1 - - - - select - tig_myparcel/system_config_source_yesno - 100 - 1 - 1 - 1 - - - - Not possible if Pickup at PostNL location is not active - select - tig_myparcel/system_config_source_yesno - 100 - 1 - 1 - 1 - - 1 - - - - - This will be added to the regular shipping price - text - validate-number - 110 - 1 - 1 - 1 - - 1 - - - - 21 diff --git a/app/design/adminhtml/default/default/template/TIG/MyParcel2014/system/config/edit.phtml b/app/design/adminhtml/default/default/template/TIG/MyParcel2014/system/config/edit.phtml index 0f3b5967..d0fa9dd5 100755 --- a/app/design/adminhtml/default/default/template/TIG/MyParcel2014/system/config/edit.phtml +++ b/app/design/adminhtml/default/default/template/TIG/MyParcel2014/system/config/edit.phtml @@ -265,7 +265,6 @@ var adminSystemConfig = { configShippingMethodsContent.insert($('tig_myparcel_morning_delivery-head').up(1)); configShippingMethodsContent.insert($('tig_myparcel_eveningdelivery-head').up(1)); configShippingMethodsContent.insert($('tig_myparcel_pickup-head').up(1)); - configShippingMethodsContent.insert($('tig_myparcel_pickup_express-head').up(1)); configShippingMethodsContent.insert($('tig_myparcel_belgium_delivery-head').up(1)); configShippingMethodsContent.insert($('tig_myparcel_pickup_belgium-head').up(1)); @@ -299,11 +298,6 @@ var adminSystemConfig = { this.updateDependsAgeCheck(); /** age check */ $('tig_myparcel_delivery_age_check').observe('change', this.updateDependsAgeCheck); - - this.updateDependsPickupCheck(); - /** Pickup Express check */ - $('tig_myparcel_pickup_pickup_active').observe('change', this.updateDependsPickupCheck); - }, updateDependsAgeCheck: function () { var active = $('tig_myparcel_delivery_age_check').value; @@ -328,20 +322,6 @@ var adminSystemConfig = { $('row_tig_myparcel_eveningdelivery_eveningdelivery_active').style.display = "table-row"; $('row_tig_myparcel_eveningdelivery_eveningdelivery_fee').style.display = "table-row"; }, - updateDependsPickupCheck: function () { - var active = $('tig_myparcel_pickup_pickup_active').value; - if (active == 1) { - $('row_tig_myparcel_pickup_express_pickup_express_not_active_holder').style.display = "none"; - $('row_tig_myparcel_pickup_express_pickup_express_active').style.display = "table-row"; - $('row_tig_myparcel_pickup_express_pickup_express_fee').style.display = "table-row"; - return; - } - - $('row_tig_myparcel_pickup_express_pickup_express_not_active_holder').style.display = "table-row"; - $('row_tig_myparcel_pickup_express_pickup_express_active').style.display = "none"; - $('row_tig_myparcel_pickup_express_pickup_express_fee').style.display = "none"; - - } }; adminSystemConfig.setFieldsInTabs(); diff --git a/app/locale/nl_NL/TIG_MyParcel2014.csv b/app/locale/nl_NL/TIG_MyParcel2014.csv index a8931de3..9a2928d0 100755 --- a/app/locale/nl_NL/TIG_MyParcel2014.csv +++ b/app/locale/nl_NL/TIG_MyParcel2014.csv @@ -90,9 +90,6 @@ TIG_MyParcel2014::Pickup at PostNL location,Ophalen bij PostNL locatie TIG_MyParcel2014::Pickup active,Ophalen actief TIG_MyParcel2014::Pickup title,Ophalen titel TIG_MyParcel2014::Pickup fee,Ophalen prijs -TIG_MyParcel2014::Pickup Express at PostNL location,Extra vroeg ophalen bij PostNL locatie -TIG_MyParcel2014::Pickup Express active,Extra vroeg ophalen actief -TIG_MyParcel2014::Pickup Express fee,Extra vroeg ophalen prijs TIG_MyParcel2014::Pickup at Belgium PostNL location,Ophalen bij een Belgische PostNL locatie TIG_MyParcel2014::Pickup Belgium active,Ophalen Belgiƫ actief TIG_MyParcel2014::Pickup Belgium title,Ophalen Belgiƫ titel diff --git a/skin/frontend/base/default/js/TIG/MyParcel2014/myparcel.js b/skin/frontend/base/default/js/TIG/MyParcel2014/myparcel.js index ff18775a..dd3b5a5c 100755 --- a/skin/frontend/base/default/js/TIG/MyParcel2014/myparcel.js +++ b/skin/frontend/base/default/js/TIG/MyParcel2014/myparcel.js @@ -102,7 +102,6 @@ MyParcel = { "priceEveningDelivery": data.eveningDelivery['fee'], "priceSignature": data.delivery['signature_fee'], "pricePickup": data.pickup['fee'], - "pricePickupExpress": data.pickupExpress['fee'], "priceOnlyRecipient": data.delivery['only_recipient_fee'], "deliveryTitel":data.delivery['delivery_title'], @@ -440,18 +439,7 @@ MyParcel = { */ if (mypajQuery('#mypa-pickup-delivery').prop('checked') || mypajQuery('#mypa-pickup-selector').prop('checked')) { - /** - * Early morning pickup - */ - if (mypajQuery('#mypa-pickup-express-selector').prop('checked')) - { - mypajQuery('#s_method_myparcel_pickup_express').click(); - MyParcel.addPickupToMagentoInput('retailexpress'); - MyParcel.addStyleToPrice('#mypa-pickup-express-price'); - return; - }else{ - MyParcel.addStyleToPrice('#mypa-pickup-price'); - } + MyParcel.addStyleToPrice('#mypa-pickup-price'); mypajQuery('#s_method_myparcel_pickup').click(); MyParcel.addPickupToMagentoInput('retail'); @@ -540,15 +528,9 @@ MyParcel = { var isPickup = mypajQuery('#mypa-pickup-delivery').is(':checked'); mypajQuery('#mypa-pickup-selector').prop('checked', true); - if(isPickup && this.currentLocation.price_comment === "retailexpress"){ - mypajQuery('#mypa-pickup-express-price').html(MyParcel.getPriceHtml(this.data.config.pricePickupExpress)); - mypajQuery('#mypa-pickup-express').show(); - - } else{ - mypajQuery('#mypa-pickup-express-selector').attr("checked", false); - mypajQuery('#mypa-pickup-express').hide(); + mypajQuery('#mypa-pickup-express-selector').attr("checked", false); + mypajQuery('#mypa-pickup-express').hide(); - } },