Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/myparcelnl/magento1 into…
Browse files Browse the repository at this point in the history 
… develop
  • Loading branch information
@RichardPerdaan
RichardPerdaan committed Apr 25, 2018
2 parents d82c85d + 9c3b7bd commit f6fde59
Show file tree
Hide file tree
Showing 6 changed files with 43 additions and 21 deletions.
4 changes: 3 additions & 1 deletion app/code/community/TIG/MyParcel2014/etc/config.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<config>
<modules>
<TIG_MyParcel2014>
<version>1.14.7-beta.1</version>
<version>1.15.0</version>
</TIG_MyParcel2014>
</modules>
<global>
Expand Down Expand Up @@ -278,6 +278,8 @@
</checkout>
<delivery>
<delivery_title>Thuis of op het werk bezorgd</delivery_title>
<retrieve_address_title>Adres ophalen...</retrieve_address_title>
<busy_loading_title>Bezig met laden...</busy_loading_title>
<only_recipient_active>1</only_recipient_active>
<only_recipient_title>Niet bij de buren bezorgen</only_recipient_title>
<only_recipient_fee>0.29</only_recipient_fee>
Expand Down
17 changes: 17 additions & 0 deletions app/code/community/TIG/MyParcel2014/etc/system.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,7 @@
<show_in_website>1</show_in_website>
<show_in_store>1</show_in_store>
</font_size>

<!-- Hide and toggle MyParcel options (used by parnis.nl) -->
<toggle_options translate="label" module="tig_myparcel">
<label>Toggle options</label>
Expand Down Expand Up @@ -300,6 +301,22 @@
<show_in_website>1</show_in_website>
<show_in_store>1</show_in_store>
</delivery_title>
<retrieve_address_title translate="label" module="tig_myparcel">
<label>Retrieve address Titel</label>
<frontend_type>text</frontend_type>
<sort_order>155</sort_order>
<show_in_default>1</show_in_default>
<show_in_website>1</show_in_website>
<show_in_store>1</show_in_store>
</retrieve_address_title>
<busy_loading_title> translate="label" module="tig_myparcel">
<label>Busy loading title</label>
<frontend_type>text</frontend_type>
<sort_order>156</sort_order>
<show_in_default>1</show_in_default>
<show_in_website>1</show_in_website>
<show_in_store>1</show_in_store>
</busy_loading_title>
<only_recipient_active translate="label" module="tig_myparcel">
<label>Home address only</label>
<comment>Deliver the package only at address of the intended recipient</comment>
Expand Down
33 changes: 15 additions & 18 deletions ...sign/frontend/base/default/template/TIG/MyParcel2014/checkout/mypa_checkout_options.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,17 @@
<body>
<div id="myparcel-template">

<?php require(Mage::getBaseDir('app') . DS . 'design/frontend/base/default/template/TIG/MyParcel2014/checkout/mypa_custom_css.php'); ?>

<?php
require(Mage::getBaseDir('app') . DS . 'design/frontend/base/default/template/TIG/MyParcel2014/checkout/mypa_custom_css.php');
$retrieveAddressTitle = $helper->getConfig('retrieve_address_title', 'delivery');
$busyLoadingTitle = $helper->getConfig('busy_loading_title', 'delivery');
?>
<div id="busy_loading_title"><?php echo $busyLoadingTitle?></div>
<div id='mypa-delivery-options-container'>
<div class="mypa-overlay">
<span id="mypa-no-options">Adres ophalen...</span>
<span id="mypa-no-options"><?php echo $retrieveAddressTitle?></span>
</div>

<div id="mypa-slider">
<!-- First frame -->
<div id="mypa-delivery-type-selection" class="mypa-tab-container mypa-slider-pos-0">
Expand All @@ -63,17 +68,14 @@
</div>
<div id='mypa-delivery-body'>
<div id='mypa-delivery-row' class='mypa-row-lg'>
<input id='mypa-delivery-option-check' type="radio" name="mypa-delivery-type"
checked>
<label id='mypa-delivery-options-title' class='mypa-row-title'
for="mypa-delivery-option-check">
<input id='mypa-delivery-option-check' type="radio" name="mypa-delivery-type" checked>
<label id='mypa-delivery-options-title' class='mypa-row-title' for="mypa-delivery-option-check">
<div class="mypa-checkmark mypa-main">
<div class="mypa-circle mypa-circle-checked"></div>
<div class="mypa-checkmark-stem"></div>
<div class="mypa-checkmark-kick"></div>
</div>
<span
class="mypa-highlight"><?php echo $helper->getConfig('delivery_title', 'delivery'); ?></span>
<span class="mypa-highlight"><?php echo $helper->getConfig('delivery_title', 'delivery'); ?></span>
<span id="mypa-global_delivery_price" class='mypa-price' style="display:none"></span>
</label>
<div id='mypa-delivery-options' class='mypa-content-lg'>
Expand All @@ -82,8 +84,7 @@
<?php if ($packageType == 2): ?>
<div id='mypa-mailbox-row' class='mypa-row-lg' style="display:none">
<input type="radio" name="mypa-delivery-type" id="mypa-mailbox-location">
<label id='mypa-mailbox-options-title' class='mypa-row-title'
for="mypa-mailbox-location">
<label id='mypa-mailbox-options-title' class='mypa-row-title' for="mypa-mailbox-location">
<div class="mypa-checkmark mypa-main">
<div class="mypa-circle"></div>
<div class="mypa-checkmark-stem"></div>
Expand All @@ -100,15 +101,13 @@
<?php endif;?>
<div id='mypa-pickup-row' class='mypa-row-lg'>
<input type="radio" name="mypa-delivery-type" id="mypa-pickup-location">
<label id='mypa-pickup-options-title' class='mypa-row-title'
for="mypa-pickup-location">
<label id='mypa-pickup-options-title' class='mypa-row-title' for="mypa-pickup-location">
<div class="mypa-checkmark mypa-main">
<div class="mypa-circle"></div>
<div class="mypa-checkmark-stem"></div>
<div class="mypa-checkmark-kick"></div>
</div>
<span
class="mypa-highlight"><?php echo $helper->getConfig('pickup_title', 'pickup'); ?></span>
<span class="mypa-highlight"><?php echo $helper->getConfig('pickup_title', 'pickup'); ?></span>
<span id="mypa-global_pickup_price" class='mypa-price' style="display:none"></span>
</label>
<div id='mypa-pickup-options-content' class='mypa-content-lg'>
Expand Down Expand Up @@ -151,9 +150,7 @@
<span id='mypa-back-arrow'><b>AFHALEN </b><span
class="mypa-location-time"></span></span>
</div>
<div id="mypa-location-container">

</div>
<div id="mypa-location-container"></div>
</div>
</div>
</div>
Expand Down
3 changes: 3 additions & 0 deletions skin/frontend/base/default/css/TIG/MyParcel2014/myparcel_options.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,9 @@ div.afhalen-right:hover + .mypa-opening-hours {
cursor: pointer;
margin-left: 10px;
}
#busy_loading_title{
display: none;
}
.mypa-pickup-selector input:checked ~ .mypa-highlight {
color:gray;
}
Expand Down
4 changes: 3 additions & 1 deletion skin/frontend/base/default/js/TIG/MyParcel2014/iframe_checkout.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,9 @@ window.mypa.settings = {};
price: price,
text: {
signed: data.delivery.signature_title,
only_recipient: data.delivery.only_recipient_title
only_recipient: data.delivery.only_recipient_title,
retrieve_address_title: data.delivery.retrieve_address_title,
busy_loading_title: data.delivery.busy_loading_title
}
});

Expand Down
3 changes: 2 additions & 1 deletion skin/frontend/base/default/js/TIG/MyParcel2014/myparcel.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,8 @@
} else {
cutoff_time = settings.cutoff_time != null ? settings.cutoff_time : void 0
}
$('#mypa-no-options').html('Bezig met laden...');

$('#mypa-no-options').text( $( '#busy_loading_title' ).html() );
$('.mypa-overlay').removeClass('mypa-hidden');
$('.mypa-location').html(street);

Expand Down

0 comments on commit f6fde59

Please sign in to comment.