Speedy_Shipping - Version 1.0.7

Version Notes

Second release

Download this release

Release Info

Developer Speedy JSC
Extension Speedy_Shipping
Version 1.0.7
Comparing to
See all releases


Code changes from version 1.0.6 to 1.0.7

Files changed (26) hide show
  1. app/code/community/Speedy/Speedyshipping/Block/Onepage/Paymentinfo.php +4 -2
  2. app/code/community/Speedy/Speedyshipping/Model/Autocomplete/Address.php +3 -1
  3. app/code/community/Speedy/Speedyshipping/Model/Carrier/Shippingmethod.php +1 -1
  4. app/code/community/Speedy/Speedyshipping/controllers/Adminhtml/PrintController.php +23 -6
  5. app/code/community/Speedy/Speedyshipping/etc/config.xml +1 -1
  6. app/design/adminhtml/default/default/template/speedy_speedyshipping/billoflading.phtml +3 -1
  7. app/design/adminhtml/default/default/template/speedy_speedyshipping/billoflading.phtml~ +0 -27
  8. app/design/adminhtml/default/default/template/speedy_speedyshipping/pickupform.phtml +1 -1
  9. app/design/adminhtml/default/default/template/speedy_speedyshipping/pickupform.phtml~ +0 -201
  10. app/design/adminhtml/default/default/template/speedy_speedyshipping/sales/order/create/billing/method/paymentInfo.phtml +1 -1
  11. app/design/adminhtml/default/default/template/speedy_speedyshipping/sales/order/create/billing/method/paymentInfo.phtml~ +0 -20
  12. app/design/adminhtml/default/default/template/speedy_speedyshipping/sales/order/create/form/address.phtml +59 -39
  13. app/design/adminhtml/default/default/template/speedy_speedyshipping/sales/order/create/form/address.phtml~ +0 -1013
  14. app/design/adminhtml/default/default/template/speedy_speedyshipping/sales/order/create/shipping/method/form.phtml~ +0 -299
  15. app/design/adminhtml/default/default/template/speedy_speedyshipping/sales/order/create/totals.phtml~ +0 -40
  16. app/design/frontend/base/default/template/speedy_speedyshipping/checkout/onepage/billing.phtml +15 -7
  17. app/design/frontend/base/default/template/speedy_speedyshipping/checkout/onepage/payment_method/paymentInfo.phtml +1 -1
  18. app/design/frontend/base/default/template/speedy_speedyshipping/checkout/onepage/shipping.phtml +11 -8
  19. app/design/frontend/base/default/template/speedy_speedyshipping/checkout/onepage/shipping_method/pickupform.phtml +7 -4
  20. app/design/frontend/base/default/template/speedy_speedyshipping/customer/address/edit.phtml +9 -4
  21. app/etc/modules/Speedyshipping.xml +1 -1
  22. app/locale/bg_BG/speedyTranslate.csv +2 -1
  23. lib/SpeedyEPS/ver01/ParamPicking.class.php~ +0 -1000
  24. package.xml +7 -7
  25. skin/adminhtml/default/default/speedy/js/validateAddress.js +3 -1
  26. skin/frontend/base/default/speedy/js/office_pickup.js +16 -6
app/code/community/Speedy/Speedyshipping/Block/Onepage/Paymentinfo.php CHANGED
@@ -107,9 +107,11 @@ class Speedy_Speedyshipping_Block_Onepage_Paymentinfo extends Mage_Payment_Block
107
  $quote = Mage::getModel('checkout/cart')->getQuote();
108
  $carrierMethod = $quote->getShippingAddress()->getShippingMethod();
109
  }
 
 
110
  $code = explode('_', $carrierMethod);
111
-
112
- if ($code) {
113
  //Is Speedy the choosen courier
114
  if ($code[0] == 'speedyshippingmodule') {
115
 
107
  $quote = Mage::getModel('checkout/cart')->getQuote();
108
  $carrierMethod = $quote->getShippingAddress()->getShippingMethod();
109
  }
110
+
111
+ if(isset($carrierMethod)){
112
  $code = explode('_', $carrierMethod);
113
+ }
114
+ if (isset($code)) {
115
  //Is Speedy the choosen courier
116
  if ($code[0] == 'speedyshippingmodule') {
117
 
app/code/community/Speedy/Speedyshipping/Model/Autocomplete/Address.php CHANGED
@@ -105,15 +105,17 @@ class Speedy_Speedyshipping_Model_Autocomplete_Address extends Mage_Core_Model_A
105
  */
106
  public function getOffices() {
107
  //Retrieve the currently selected site id from the request
108
- $cityId = (int) $this->_request->getParam('cityid');
109
  $officeName = $this->_request->getParam('term');
110
 
111
  $officeName = Mage::helper('speedyshippingmodule/transliterate')->transliterate($officeName);
 
112
  try {
113
  $offices = $this->_speedyEPS->listOffices($officeName, $cityId);
114
  } catch (Exception $e) {
115
 
116
  }
 
117
  if (isset($offices)) {
118
  $tpl = array();
119
 
105
  */
106
  public function getOffices() {
107
  //Retrieve the currently selected site id from the request
108
+ $cityId = (int) $this->_request->getParam('cityid', null);
109
  $officeName = $this->_request->getParam('term');
110
 
111
  $officeName = Mage::helper('speedyshippingmodule/transliterate')->transliterate($officeName);
112
+ if($cityId){
113
  try {
114
  $offices = $this->_speedyEPS->listOffices($officeName, $cityId);
115
  } catch (Exception $e) {
116
 
117
  }
118
+ }
119
  if (isset($offices)) {
120
  $tpl = array();
121
 
app/code/community/Speedy/Speedyshipping/Model/Carrier/Shippingmethod.php CHANGED
@@ -1402,7 +1402,7 @@ class Speedy_Speedyshipping_Model_Carrier_Shippingmethod extends Mage_Shipping_M
1402
  $freeInterCityMethod = Mage::getStoreConfig('carriers/speedyshippingmodule/free_method_intercity');
1403
 
1404
 
1405
- if ($isFixed) {
1406
 
1407
  $freeMethod = 'speedy_fixed_price';
1408
  }
1402
  $freeInterCityMethod = Mage::getStoreConfig('carriers/speedyshippingmodule/free_method_intercity');
1403
 
1404
 
1405
+ if ($isFixed == 2) {
1406
 
1407
  $freeMethod = 'speedy_fixed_price';
1408
  }
app/code/community/Speedy/Speedyshipping/controllers/Adminhtml/PrintController.php CHANGED
@@ -285,8 +285,9 @@ class Speedy_Speedyshipping_Adminhtml_PrintController extends Mage_Adminhtml_Con
285
  }
286
  }
287
 
 
288
  if (count($errors) > 0) {
289
- $errorString = '';
290
  foreach ($errors as $error) {
291
  $errorString .= ' ' . $error['main_error'];
292
  for ($i = 0; $i < count($error); $i++) {
@@ -297,10 +298,10 @@ class Speedy_Speedyshipping_Adminhtml_PrintController extends Mage_Adminhtml_Con
297
 
298
  throw new Exception("Error while making remote call");
299
  }
300
-
301
  //If there are any error this section never get executed
302
  if (count($succeededOrders) > 0 && !$shouldFail) {
303
- $successString = '';
304
  foreach ($succeededOrders as $order) {
305
  $successString .= $order . '<br />';
306
  }
@@ -1108,6 +1109,12 @@ class Speedy_Speedyshipping_Adminhtml_PrintController extends Mage_Adminhtml_Con
1108
  $picking->setWeightDeclared($totalWeight);
1109
  $picking->setContents('поръчка: ' . $this->_orderID);
1110
 
 
 
 
 
 
 
1111
  if(Mage::getStoreConfig('carriers/speedyshippingmodule/default_packing') &&
1112
  strlen(Mage::getStoreConfig('carriers/speedyshippingmodule/default_packing')) > 1){
1113
  $picking->setPacking(Mage::getStoreConfig('carriers/speedyshippingmodule/default_packing'));
@@ -1149,7 +1156,7 @@ class Speedy_Speedyshipping_Adminhtml_PrintController extends Mage_Adminhtml_Con
1149
 
1150
  if ($this->_orderData->getIsCod()) {
1151
  $isFixed = Mage::getStoreConfig('carriers/speedyshippingmodule/fixed_pricing_enable');
1152
- if ($isFixed) {
1153
 
1154
  $fixedPrice = Mage::getStoreConfig('carriers/speedyshippingmodule/fixedPrice');
1155
  if ($this->_isFreeShipping) {
@@ -1158,7 +1165,17 @@ class Speedy_Speedyshipping_Adminhtml_PrintController extends Mage_Adminhtml_Con
1158
  $taxCalculator = Mage::helper('tax');
1159
  $picking->setAmountCodBase($this->_codAmount + $this->_shippingAmount);
1160
  }
1161
- } else {
 
 
 
 
 
 
 
 
 
 
1162
  $picking->setAmountCodBase($this->_codAmount);
1163
  }
1164
  } else {
@@ -1264,7 +1281,7 @@ class Speedy_Speedyshipping_Adminhtml_PrintController extends Mage_Adminhtml_Con
1264
  //Is fixed prices enabled
1265
  $isFixed = Mage::getStoreConfig('carriers/speedyshippingmodule/fixed_pricing_enable');
1266
 
1267
- if ($isFixed) {
1268
 
1269
  $orderData->setPayerType(ParamCalculation::PAYER_TYPE_SENDER);
1270
  } else if ($speedyData->getPayerType() == 0) {
285
  }
286
  }
287
 
288
+ $errorString = '';
289
  if (count($errors) > 0) {
290
+
291
  foreach ($errors as $error) {
292
  $errorString .= ' ' . $error['main_error'];
293
  for ($i = 0; $i < count($error); $i++) {
298
 
299
  throw new Exception("Error while making remote call");
300
  }
301
+ $successString = '';
302
  //If there are any error this section never get executed
303
  if (count($succeededOrders) > 0 && !$shouldFail) {
304
+
305
  foreach ($succeededOrders as $order) {
306
  $successString .= $order . '<br />';
307
  }
1109
  $picking->setWeightDeclared($totalWeight);
1110
  $picking->setContents('поръчка: ' . $this->_orderID);
1111
 
1112
+ if(Mage::getStoreConfig('carriers/speedyshippingmodule/deferredDays')){
1113
+ $picking->setDeferredDeliveryWorkDays((int)Mage::getStoreConfig('carriers/speedyshippingmodule/deferredDays'));
1114
+ }
1115
+
1116
+
1117
+
1118
  if(Mage::getStoreConfig('carriers/speedyshippingmodule/default_packing') &&
1119
  strlen(Mage::getStoreConfig('carriers/speedyshippingmodule/default_packing')) > 1){
1120
  $picking->setPacking(Mage::getStoreConfig('carriers/speedyshippingmodule/default_packing'));
1156
 
1157
  if ($this->_orderData->getIsCod()) {
1158
  $isFixed = Mage::getStoreConfig('carriers/speedyshippingmodule/fixed_pricing_enable');
1159
+ if ($isFixed == 2) {
1160
 
1161
  $fixedPrice = Mage::getStoreConfig('carriers/speedyshippingmodule/fixedPrice');
1162
  if ($this->_isFreeShipping) {
1165
  $taxCalculator = Mage::helper('tax');
1166
  $picking->setAmountCodBase($this->_codAmount + $this->_shippingAmount);
1167
  }
1168
+ }else if($isFixed == 3){
1169
+ if ($this->_isFreeShipping) {
1170
+ $picking->setAmountCodBase($this->_codAmount);
1171
+ } else {
1172
+ $taxCalculator = Mage::helper('tax');
1173
+ $chargeAmount = Mage::getStoreConfig('carriers/speedyshippingmodule/handlingCharge');
1174
+ $chargeWithTaxApplied = $taxCalculator->getShippingPrice($chargeAmount, true);
1175
+ $picking->setAmountCodBase($this->_codAmount + $chargeWithTaxApplied);
1176
+ }
1177
+ }
1178
+ else {
1179
  $picking->setAmountCodBase($this->_codAmount);
1180
  }
1181
  } else {
1281
  //Is fixed prices enabled
1282
  $isFixed = Mage::getStoreConfig('carriers/speedyshippingmodule/fixed_pricing_enable');
1283
 
1284
+ if ($isFixed == 2) {
1285
 
1286
  $orderData->setPayerType(ParamCalculation::PAYER_TYPE_SENDER);
1287
  } else if ($speedyData->getPayerType() == 0) {
app/code/community/Speedy/Speedyshipping/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <Speedy_Speedyshipping>
5
- <version>1.0.6</version>
6
  <depends>
7
  <Mage_Payment />
8
  <Mage_Shipping />
2
  <config>
3
  <modules>
4
  <Speedy_Speedyshipping>
5
+ <version>1.0.7</version>
6
  <depends>
7
  <Mage_Payment />
8
  <Mage_Shipping />
app/design/adminhtml/default/default/template/speedy_speedyshipping/billoflading.phtml CHANGED
@@ -22,10 +22,12 @@
22
  document.observe("dom:loaded", function() {
23
 
24
 
25
- packaging.setCreateLabelUrl("<?php echo $this->getCreateLabelUrl(); ?>");
26
 
27
 
28
  setTimeout(function() {
 
 
29
  var elems = document.getElementsByClassName('SavePackagesBtn');
30
  //packaging.labelCreatedCallback(response);
31
 
22
  document.observe("dom:loaded", function() {
23
 
24
 
25
+
26
 
27
 
28
  setTimeout(function() {
29
+
30
+ packaging.setCreateLabelUrl("<?php echo $this->getCreateLabelUrl(); ?>");
31
  var elems = document.getElementsByClassName('SavePackagesBtn');
32
  //packaging.labelCreatedCallback(response);
33
 
app/design/adminhtml/default/default/template/speedy_speedyshipping/billoflading.phtml~ DELETED
@@ -1,27 +0,0 @@
1
-
2
- <?php if($this->_isSpeedyCarrier) : ?>
3
- <div class="entry-edit box-left">
4
-
5
- <?php if($this->_hasBOL): ?>
6
- <div class="entry-edit-head">
7
- <h4><?php echo $this->getHeaderText() ?></h4>
8
- </div>
9
- <fieldset>
10
-
11
- <?php echo $this->getPrintButton() ?>
12
- <?php echo $this->getCancelBolButton() ?>
13
- </div>
14
-
15
- </fieldset>
16
-
17
- <div class="clear"></div>
18
- <?php endif; ?>
19
- <script>
20
-
21
- //<![CDATA[
22
- document.observe("dom:loaded", function() {
23
- packaging.setCreateLabelUrl("<?php echo $this->getCreateLabelUrl(); ?>");
24
- });
25
- //]]>
26
- </script>
27
- <?php endif; ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/design/adminhtml/default/default/template/speedy_speedyshipping/pickupform.phtml CHANGED
@@ -32,7 +32,7 @@ var fixedHourLabel = "<?php echo $this->__("fixed hour extra charge") ?>";
32
  <?php if($isFixedHourEnabled) : ?>
33
  <tr>
34
  <td><label for="speed_exact_hour_enable"><?php echo $this->__("choose fixed hour") ?></label><br />
35
- <?php if(!$isFixedPrice): ?>
36
  <p id="fixed_price_view"><?php echo $this->__("fixed hour extra charge") ?></p>
37
  <?php endif; ?>
38
  </td>
32
  <?php if($isFixedHourEnabled) : ?>
33
  <tr>
34
  <td><label for="speed_exact_hour_enable"><?php echo $this->__("choose fixed hour") ?></label><br />
35
+ <?php if($isFixedPrice != 2): ?>
36
  <p id="fixed_price_view"><?php echo $this->__("fixed hour extra charge") ?></p>
37
  <?php endif; ?>
38
  </td>
app/design/adminhtml/default/default/template/speedy_speedyshipping/pickupform.phtml~ DELETED
@@ -1,201 +0,0 @@
1
- <script type="text/javascript">
2
- <?php if($this->helper('tax')->displayShippingPriceExcludingTax()): ?>
3
- var excludeTax= <?php echo $this->helper('tax')->displayShippingPriceExcludingTax()?>;
4
- <?php else: ?>
5
- var excludeTax = null;
6
- <?php endif; ?>
7
-
8
- <?php if($this->helper('tax')->displayShippingPriceIncludingTax()): ?>
9
- var includeTax= <?php echo $this->helper('tax')->displayShippingPriceIncludingTax()?>;
10
- <?php else: ?>
11
- var includeTax= null;
12
- <?php endif; ?>
13
-
14
-
15
- <?php if($this->helper('tax')->displayShippingBothPrices()): ?>
16
- var showBoth= <?php echo $this->helper('tax')->displayShippingBothPrices()?>;
17
- <?php else: ?>
18
- var showBoth= null;
19
- <?php endif; ?>
20
- </script>
21
- <script type="text/javascript">
22
- var fixedHourLabel = "<?php echo $this->__("fixed hour extra charge") ?>";
23
- </script>
24
- <?php $isFixedPrice = Mage::getStoreConfig('carriers/speedyshippingmodule/fixed_pricing_enable'); ?>
25
- <?php $isFixedHourEnabled = Mage::getStoreConfig('carriers/speedyshippingmodule/add_fixed_hour'); ?>
26
-
27
-
28
-
29
- <div id="speedy_admin_form">
30
- <table class="form-list">
31
- <tbody>
32
- <?php if($isFixedHourEnabled) : ?>
33
- <tr>
34
- <td><label for="speed_exact_hour_enable"><?php echo $this->__("choose fixed hour") ?></label><br />
35
- <?php if(!$isFixedPrice): ?>
36
- <p id="fixed_price_view"><?php echo $this->__("fixed hour extra charge") ?></p>
37
- <?php endif; ?>
38
- </td>
39
- </tr>
40
- <tr>
41
- <td colspan="3">
42
- <?php if($this->_isExactHourUsed): ?>
43
- <input type="checkbox" name="speed_exact_hour_enable" checked="checked" class="input-box" id="speedy_exact_hour_enable" />
44
- <?php else: ?>
45
- <input type="checkbox" disabled="disabled" name="speed_exact_hour_enable" class="input-box" id="speedy_exact_hour_enable" />
46
- <?php endif; ?>
47
-
48
-
49
-
50
- <label for="speedy_exact_hour"><?php echo $this->__("Hour") ?>:</label>
51
- <?php if (isset($this->_hour)): ?>
52
- <input type="text" style="width:45px;" value="<?php echo $this->_hour; ?>" name="speedy_exact_hour" id="speedy_exact_hour" class="input-text" />
53
- <?php else: ?>
54
- <input type="text" style="width:45px;" name="speedy_exact_hour" id="speedy_exact_hour" class="input-text" disabled="disabled" />
55
- <?php endif; ?>
56
-
57
- <?php if (isset($this->_minutes)): ?>
58
- <input type="text" style="width:45px;" value="<?php echo $this->_minutes; ?>" name="speedy_exact_minutes" id="speedy_exact_minutes" class="input-text" />
59
- <?php else: ?>
60
- <input type="text" style="width:45px;" name="speedy_exact_minutes" id="speedy_exact_minutes" class="input-text" disabled="disabled" />
61
- <?php endif; ?>
62
- </tr>
63
- <?php endif; ?>
64
- <tr>
65
- <td>
66
- <button id="speedyRecalculateShipping" name="speedyRecalculateShippingBtn" class="button validation-passed" type="button">
67
- <span><span><?php echo $this->__('Recalculate') ?></span></span></button><br /></td>
68
- </tr>
69
-
70
-
71
- </tbody>
72
- </table>
73
- </div>
74
-
75
- <script type="text/javascript">
76
-
77
- $j('document').ready(function() {
78
-
79
- var currentMethod = $j('#order-shipping-method-choose input:radio:checked');
80
- setActiveInlineRadioButton(currentMethod);
81
-
82
- $j('#speedy_exact_hour,#speedy_exact_minutes').keypress(function(evt){
83
-
84
-
85
- if($j(this).val().length > 1){
86
- //evt.preventDefault();
87
-
88
-
89
- $j(this).blur();
90
- }
91
- })
92
-
93
-
94
- if ($j('div.speedy_method_options :checkbox').is(':checked')) {
95
- $j('div#speedy_admin_form').show();
96
- }
97
-
98
- $j('#speedyRecalculateShipping').click(function(evt) {
99
- evt.preventDefault();
100
-
101
- //onclick="order.loadShippingRates(true);"
102
-
103
- var isEnabled = $j('#speedy_exact_hour_enable').is(':checked');
104
- var hour = parseInt($j('#speedy_exact_hour').val(), 10);
105
- var minutes = parseInt($j('#speedy_exact_minutes').val(), 10);
106
-
107
-
108
- if (isEnabled) {
109
-
110
- if (isNaN(hour) || isNaN(minutes)) {
111
- alert('Моля, въведете валиден час');
112
- return;
113
- }
114
-
115
- if(hour.toString().length > 2 || minutes.toString().length > 2){
116
- alert('Моля, въведете валиден час');
117
- return;
118
- }
119
-
120
- if (hour !== false && !isNaN(hour) && minutes !== false && !isNaN(minutes)) {
121
- if ((hour <= 17 && hour >= 10)) {
122
-
123
-
124
- if (hour == 17 && minutes >= 31) {
125
-
126
- alert('Моля, въведете валиден час');
127
- return;
128
- }
129
-
130
- if (hour == 10 && minutes <= 29) {
131
- alert('Моля, въведете валиден час');
132
- return;
133
- }
134
-
135
-
136
- if (minutes <= 59 && minutes >= 0) {
137
-
138
- order.loadShippingRates(true)
139
- }else{
140
- alert('Моля, въведете валиден час');
141
- return;
142
- }
143
- }else{
144
- alert('Моля, въведете валиден час');
145
- return;
146
- }
147
- }
148
-
149
- } else {
150
- order.loadShippingRates(true)
151
- }
152
- })
153
-
154
- function setActiveInlineRadioButton(button) {
155
-
156
-
157
- var isExactHourAllowed = $j(button).nextAll('div.speedy_method_options').find('input:hidden.speedy_exacthour_allowed').length
158
- var isFreeMethod = $j(button).nextAll('input:hidden');
159
-
160
- if ($j(button).is(':checked') && isExactHourAllowed) {
161
-
162
- $j('#speedy_exact_picking_data input#speedy_exact_hour_enable').removeAttr('disabled')
163
- var finalSelector = $j(button).nextAll('div.speedy_method_options');
164
- var priceWithTax = $j(finalSelector).find('input:hidden.speedy_exacthour_allowed').val()
165
- var priceWithoutTax = $j(finalSelector).find('input:hidden.speedy_exacthour_withouttax').val()
166
- var price = '';
167
- if(!isFreeMethod.length){
168
- if (includeTax) {
169
- price += priceWithTax;
170
- }
171
- if (excludeTax) {
172
- price += '/' + priceWithoutTax;
173
- }
174
- if(showBoth){
175
- price += priceWithoutTax+'/'+priceWithTax;
176
- }
177
-
178
- }else{
179
- price = '0.00';
180
- }
181
- price += ' лв.';
182
- $j('p#fixed_price_view').show().text('Надбавка "Фиксиран час": '+price)
183
-
184
- } else {
185
-
186
- $j('#speedy_exact_picking_data input#speedy_exact_hour_enable').attr('disabled', 'disabled').removeAttr('checked');
187
- $j('#speedy_exact_picking_data input:text').attr('disabled', 'disabled').val('')
188
- $j('p#fixed_price_view').text('<?php echo $this->__("fixed hour extra charge") ?>');
189
- isExactHourAllowed = false;
190
-
191
- }
192
-
193
- }
194
-
195
-
196
-
197
- })
198
-
199
- </script>
200
-
201
-
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/design/adminhtml/default/default/template/speedy_speedyshipping/sales/order/create/billing/method/paymentInfo.phtml CHANGED
@@ -1,7 +1,7 @@
1
 
2
 
3
  <?php $isFixed = Mage::getStoreConfig('carriers/speedyshippingmodule/fixed_pricing_enable'); ?>
4
- <?php if ($this->_codAmount && !$isFixed && !$this->_isFreeMethod){
5
  $output = '';
6
  $output = '<p>'.$this->__('Speedy Payment method tax');
7
  $_excl = $this->_codAmount;
1
 
2
 
3
  <?php $isFixed = Mage::getStoreConfig('carriers/speedyshippingmodule/fixed_pricing_enable'); ?>
4
+ <?php if ($this->_codAmount && ($isFixed != 2) && !$this->_isFreeMethod){
5
  $output = '';
6
  $output = '<p>'.$this->__('Speedy Payment method tax');
7
  $_excl = $this->_codAmount;
app/design/adminhtml/default/default/template/speedy_speedyshipping/sales/order/create/billing/method/paymentInfo.phtml~ DELETED
@@ -1,20 +0,0 @@
1
-
2
-
3
- <?php $isFixed = Mage::getStoreConfig('carriers/speedyshippingmodule/fixed_pricing_enable'); ?>
4
- <?php if ($this->_codAmount && !$isFixed && !$this->_isFreeMethod){
5
- $output = '';
6
- $output = '<p>'.$this->__('Speedy Payment method tax');
7
- $_excl = $this->_codAmount;
8
- $_incl = $this->_codAmountWithTaxApplied;
9
- $output .= $_excl.' лв.';
10
- if ($this->helper('tax')->displayShippingBothPrices() && $_incl != $_excl){
11
- $output .=' ('.$this->__('Incl. Tax').') '. $_incl.' лв.';
12
- }
13
-
14
- $output .= '</p>';
15
- }
16
-
17
- if(isset($output)){
18
- echo $output;
19
- }
20
- ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/design/adminhtml/default/default/template/speedy_speedyshipping/sales/order/create/form/address.phtml CHANGED
@@ -98,8 +98,13 @@ $j('button#submit_order_top_button,button.save[id!="submit_order_top_button"]').
98
  <?php if ($this->getIsShipping()): ?>
99
  var target = 'shipping';
100
 
 
 
 
 
 
101
 
102
-
103
  <?php $reqData = Mage::app()->getRequest()->getPost('order'); ?>
104
 
105
  <?php $currentAction = Mage::app()->getRequest()->getActionName(); ?>
@@ -111,8 +116,10 @@ $j('button#submit_order_top_button,button.save[id!="submit_order_top_button"]').
111
  <?php elseif (isset($reqData['shipping_address']['speedy_office_chooser'])
112
  &&$reqData['shipping_address']['speedy_office_chooser'] == 1): ?>
113
 
114
- <?php if(!$reqData['shipping_address']['customer_address_id']): ?>
115
- allowForcedOfficeChoice = 1;
 
 
116
 
117
  <?php endif; ?>
118
  <?php endif; ?>
@@ -127,6 +134,12 @@ $j('button#submit_order_top_button,button.save[id!="submit_order_top_button"]').
127
  var isFullNomenclature = 0;
128
 
129
  var isShippingSameAsBilling = $j('#order-shipping_same_as_billing').is(':checked');
 
 
 
 
 
 
130
 
131
  var shouldAddressBeDisabled = $j('#order-' + target + '_address_customer_address_id').val();
132
  if (shouldAddressBeDisabled) {
@@ -179,7 +192,7 @@ $j('button#submit_order_top_button,button.save[id!="submit_order_top_button"]').
179
  }
180
  }
181
 
182
- checkIsOffice();
183
 
184
 
185
  var siteName = '';
@@ -216,6 +229,10 @@ $j('button#submit_order_top_button,button.save[id!="submit_order_top_button"]').
216
 
217
  $j('#order-' + target + '_address_customer_address_id').change(function(evt) {
218
 
 
 
 
 
219
  checkIsOffice();
220
 
221
  if ($j('#' + baseFieldSelector + 'city').val() != '') {
@@ -261,6 +278,8 @@ $j('button#submit_order_top_button,button.save[id!="submit_order_top_button"]').
261
 
262
 
263
  var evtTarget = $j(evt.target);
 
 
264
 
265
  if (target == 'shipping') {
266
  isFullNomenclature = shippingNomenclature;
@@ -271,7 +290,7 @@ $j('button#submit_order_top_button,button.save[id!="submit_order_top_button"]').
271
  evtTarget.val('')
272
  $j('#' + baseFieldSelector + 'speedy_street_id').val('');
273
  concatenateStreetAddress();
274
- var event = {type: 'change', target: this}
275
  order.changeAddressField(event)
276
  }
277
 
@@ -280,18 +299,18 @@ $j('button#submit_order_top_button,button.save[id!="submit_order_top_button"]').
280
  evtTarget.val('')
281
  $j('#' + baseFieldSelector + 'speedy_street_id').val('');
282
  concatenateStreetAddress();
283
- var event = {type: 'change', target: this}
284
  order.changeAddressField(event)
285
  } else if ($j('#' + baseFieldSelector + 'speedy_street_id').val() != '' && isFullNomenclature != 'FULL' && evtTarget.val() != streetName) {
286
  evtTarget.val('')
287
  $j('#' + baseFieldSelector + 'speedy_street_id').val('');
288
  concatenateStreetAddress();
289
- var event = {type: 'change', target: this}
290
  order.changeAddressField(event)
291
  } else {
292
  evtTarget.val(evtTarget.val().toUpperCase())
293
  concatenateStreetAddress();
294
- var event = {type: 'change', target: this}
295
  order.changeAddressField(event)
296
  }
297
 
@@ -303,7 +322,7 @@ $j('button#submit_order_top_button,button.save[id!="submit_order_top_button"]').
303
  evtTarget.val('')
304
  $j('#' + baseFieldSelector + 'speedy_quarter_id').val('');
305
  concatenateStreetAddress();
306
- var event = {type: 'change', target: this}
307
  order.changeAddressField(event)
308
  }
309
 
@@ -312,18 +331,18 @@ $j('button#submit_order_top_button,button.save[id!="submit_order_top_button"]').
312
  evtTarget.val('')
313
  $j('#' + baseFieldSelector + 'speedy_quarter_id').val('');
314
  concatenateStreetAddress();
315
- var event = {type: 'change', target: this}
316
  order.changeAddressField(event)
317
  } else if ($j('#' + baseFieldSelector + 'speedy_quarter_id').val() != '' && isFullNomenclature != 'FULL' && evtTarget.val() != quarterName) {
318
  evtTarget.val('')
319
  $j('#' + baseFieldSelector + 'speedy_quarter_id').val('');
320
  concatenateStreetAddress();
321
- var event = {type: 'change', target: this}
322
  order.changeAddressField(event)
323
  } else {
324
  evtTarget.val(evtTarget.val().toUpperCase())
325
  concatenateStreetAddress();
326
- var event = {type: 'change', target: this}
327
  order.changeAddressField(event)
328
  }
329
 
@@ -336,7 +355,7 @@ $j('button#submit_order_top_button,button.save[id!="submit_order_top_button"]').
336
  $j('#' + baseFieldSelector + 'speedy_office_id').val('');
337
  $j('#' + baseFieldSelector + 'speedy_street_name').val('')
338
  concatenateStreetAddress();
339
- var event = {type: 'change', target: this}
340
  order.changeAddressField(event)
341
  }
342
 
@@ -346,25 +365,26 @@ $j('button#submit_order_top_button,button.save[id!="submit_order_top_button"]').
346
  $j('#' + baseFieldSelector + 'speedy_office_id').val('');
347
  $j('#' + baseFieldSelector + 'speedy_street_name').val('')
348
  concatenateStreetAddress();
349
- var event = {type: 'change', target: this}
350
  order.changeAddressField(event)
351
  } else if ($j('#speedy_office_id').val() != '' && evtTarget.val() != officeName) {
352
  evtTarget.val('')
353
  $j('#' + baseFieldSelector + 'speedy_office_id').val('');
354
  $j('#' + baseFieldSelector + 'speedy_street_name').val('')
355
  concatenateStreetAddress();
356
- var event = {type: 'change', target: this}
357
  order.changeAddressField(event)
358
  } else {
359
  evtTarget.val(evtTarget.val().toUpperCase())
360
  concatenateStreetAddress();
361
- var event = {type: 'change', target: this}
362
  order.changeAddressField(event)
363
  }
364
 
365
  } else if (evtTarget.attr('id') != baseFieldSelector + 'city' && evtTarget.attr('id') != baseFieldSelector + 'speedy_office_chooser') {
 
366
  evtTarget.val(evtTarget.val().toUpperCase())
367
- var event = {type: 'change', target: this}
368
  order.changeAddressField(event)
369
  }
370
  } else {
@@ -377,7 +397,7 @@ $j('button#submit_order_top_button,button.save[id!="submit_order_top_button"]').
377
  evtTarget.val('')
378
  $j('#' + baseFieldSelector + 'speedy_street_id').val('');
379
  concatenateStreetAddress();
380
- var event = {type: 'change', target: this}
381
  order.changeAddressField(event)
382
  }
383
 
@@ -386,18 +406,18 @@ $j('button#submit_order_top_button,button.save[id!="submit_order_top_button"]').
386
  evtTarget.val('')
387
  $j('#' + baseFieldSelector + 'speedy_street_id').val('');
388
  concatenateStreetAddress();
389
- var event = {type: 'change', target: this}
390
  order.changeAddressField(event)
391
  } else if ($j('#' + baseFieldSelector + 'speedy_street_id').val() != '' && isFullNomenclature != 'FULL' && evtTarget.val() != streetName) {
392
  evtTarget.val('')
393
  $j('#' + baseFieldSelector + 'speedy_street_id').val('');
394
  concatenateStreetAddress();
395
- var event = {type: 'change', target: this}
396
  order.changeAddressField(event)
397
  } else {
398
  evtTarget.val(evtTarget.val().toUpperCase())
399
  concatenateStreetAddress();
400
- var event = {type: 'change', target: this}
401
  order.changeAddressField(event)
402
  }
403
 
@@ -409,7 +429,7 @@ $j('button#submit_order_top_button,button.save[id!="submit_order_top_button"]').
409
  evtTarget.val('')
410
  $j('#' + baseFieldSelector + 'speedy_quarter_id').val('');
411
  concatenateStreetAddress();
412
- var event = {type: 'change', target: this}
413
  order.changeAddressField(event)
414
  }
415
 
@@ -418,18 +438,18 @@ $j('button#submit_order_top_button,button.save[id!="submit_order_top_button"]').
418
  evtTarget.val('')
419
  $j('#' + baseFieldSelector + 'speedy_quarter_id').val('');
420
  concatenateStreetAddress();
421
- var event = {type: 'change', target: this}
422
  order.changeAddressField(event)
423
  } else if ($j('#' + baseFieldSelector + 'speedy_quarter_id').val() != '' && isFullNomenclature != 'FULL' && evtTarget.val() != quarterName) {
424
  evtTarget.val('')
425
  $j('#' + baseFieldSelector + 'speedy_quarter_id').val('');
426
  concatenateStreetAddress();
427
- var event = {type: 'change', target: this}
428
  order.changeAddressField(event)
429
  } else {
430
  evtTarget.val(evtTarget.val().toUpperCase())
431
  concatenateStreetAddress();
432
- var event = {type: 'change', target: this}
433
  order.changeAddressField(event)
434
  }
435
 
@@ -442,7 +462,7 @@ $j('button#submit_order_top_button,button.save[id!="submit_order_top_button"]').
442
  $j('#' + baseFieldSelector + 'speedy_office_id').val('');
443
  $j('#' + baseFieldSelector + 'speedy_street_name').val('')
444
  concatenateStreetAddress();
445
- var event = {type: 'change', target: this}
446
  order.changeAddressField(event)
447
  }
448
 
@@ -452,25 +472,25 @@ $j('button#submit_order_top_button,button.save[id!="submit_order_top_button"]').
452
  $j('#' + baseFieldSelector + 'speedy_office_id').val('');
453
  $j('#' + baseFieldSelector + 'speedy_street_name').val('')
454
  concatenateStreetAddress();
455
- var event = {type: 'change', target: this}
456
  order.changeAddressField(event)
457
  } else if ($j('#speedy_office_id').val() != '' && evtTarget.val() != officeName) {
458
  evtTarget.val('')
459
  $j('#' + baseFieldSelector + 'speedy_office_id').val('');
460
  $j('#' + baseFieldSelector + 'speedy_street_name').val('')
461
  concatenateStreetAddress();
462
- var event = {type: 'change', target: this}
463
  order.changeAddressField(event)
464
  } else {
465
  evtTarget.val(evtTarget.val().toUpperCase())
466
  concatenateStreetAddress();
467
- var event = {type: 'change', target: this}
468
  order.changeAddressField(event)
469
  }
470
 
471
  } else if (evtTarget.attr('id') != baseFieldSelector + 'city' && evtTarget.attr('id') != baseFieldSelector + 'speedy_office_chooser') {
472
  evtTarget.val(evtTarget.val().toUpperCase())
473
- var event = {type: 'change', target: this}
474
  order.changeAddressField(event)
475
  }
476
  }
@@ -479,7 +499,7 @@ $j('button#submit_order_top_button,button.save[id!="submit_order_top_button"]').
479
  })
480
 
481
 
482
- $j('#' + baseFieldSelector + 'city').change(function() {
483
 
484
  if (siteName != $j(this).val()) {
485
 
@@ -487,7 +507,7 @@ $j('button#submit_order_top_button,button.save[id!="submit_order_top_button"]').
487
  $j('#' + baseFieldSelector + 'speedy_site_id').val('')
488
  $j('#' + baseFieldSelector + 'zip').val('')
489
  updateForm(target);
490
- var event = {type: 'change', target: this}
491
  order.changeAddressField(event)
492
  } else if ($j(this).val() == "") {
493
 
@@ -496,7 +516,7 @@ $j('button#submit_order_top_button,button.save[id!="submit_order_top_button"]').
496
  $j('#' + baseFieldSelector + 'speedy_site_id').val('')
497
  $j('#' + baseFieldSelector + 'zip').val('')
498
  // clearForm();
499
- var event = {type: 'change', target: this}
500
  order.changeAddressField(event)
501
  } else {
502
  updateForm(target, true);
@@ -605,7 +625,7 @@ $j('button#submit_order_top_button,button.save[id!="submit_order_top_button"]').
605
 
606
  }
607
 
608
- var event = {type: 'change', target: this}
609
  order.changeAddressField(event)
610
 
611
  });
@@ -673,7 +693,7 @@ $j('button#submit_order_top_button,button.save[id!="submit_order_top_button"]').
673
  $j('#order-' + activeTarget + '_address_region').show().val(ui.item.region)
674
 
675
  concatenateStreetAddress();
676
- var event = {type: 'change', target: this}
677
  order.changeAddressField(event)
678
  $j('order-' + activeTarget + '_address_postcode').val(ui.item.post_code)
679
  if (ui.item.is_full_nomenclature == 'NO') {
@@ -738,7 +758,7 @@ $j('button#submit_order_top_button,button.save[id!="submit_order_top_button"]').
738
  // concatenateStreetAddress();
739
 
740
  //do not delete this
741
- var event = {type: 'change', target: this}
742
  order.changeAddressField(event)
743
  return false;
744
  }}).focus(function() {
@@ -775,7 +795,7 @@ $j('button#submit_order_top_button,button.save[id!="submit_order_top_button"]').
775
  concatenateStreetAddress();
776
  quarterName = ui.item.label;
777
  $j('#order-' + activeTarget + '_address_speedy_quarter_id').val(ui.item.value)
778
- var event = {type: 'change', target: this}
779
  order.changeAddressField(event)
780
  return false;
781
  }});
@@ -801,7 +821,7 @@ $j('button#submit_order_top_button,button.save[id!="submit_order_top_button"]').
801
  concatenateStreetAddress();
802
  streetName = ui.item.label;
803
  $j('#order-' + activeTarget + '_address_speedy_street_id').val(ui.item.value)
804
- var event = {type: 'change', target: this}
805
  order.changeAddressField(event)
806
  return false;
807
  }});
@@ -830,7 +850,7 @@ $j('button#submit_order_top_button,button.save[id!="submit_order_top_button"]').
830
  $j(this).val(ui.item.label);
831
  concatenateStreetAddress();
832
  // $j('#order-' + activeTarget + '_address_speedy_street_id').val(ui.item.value)
833
- var event = {type: 'change', target: this}
834
  order.changeAddressField(event)
835
  return false;
836
  }});
98
  <?php if ($this->getIsShipping()): ?>
99
  var target = 'shipping';
100
 
101
+ if(isFirstPageLoad <=1){
102
+ var billingAddressId = $j('#order-billing_address_customer_address_id').val()
103
+ $j('#order-shipping_address_customer_address_id').val(billingAddressId);
104
+ isFirstPageLoad++;
105
+ }
106
 
107
+
108
  <?php $reqData = Mage::app()->getRequest()->getPost('order'); ?>
109
 
110
  <?php $currentAction = Mage::app()->getRequest()->getActionName(); ?>
116
  <?php elseif (isset($reqData['shipping_address']['speedy_office_chooser'])
117
  &&$reqData['shipping_address']['speedy_office_chooser'] == 1): ?>
118
 
119
+ <?php if(array_key_exists('customer_address_id',$reqData['shipping_address'])): ?>
120
+ <?php if(!$reqData['shipping_address']['customer_address_id']): ?>
121
+ allowForcedOfficeChoice = 1;
122
+ <?php endif; ?>
123
 
124
  <?php endif; ?>
125
  <?php endif; ?>
134
  var isFullNomenclature = 0;
135
 
136
  var isShippingSameAsBilling = $j('#order-shipping_same_as_billing').is(':checked');
137
+
138
+ $j('#order-shipping_same_as_billing').change(function(evt){
139
+ if(isFirstPageLoad == 0){
140
+ isFirstPageLoad = 2;
141
+ }
142
+ })
143
 
144
  var shouldAddressBeDisabled = $j('#order-' + target + '_address_customer_address_id').val();
145
  if (shouldAddressBeDisabled) {
192
  }
193
  }
194
 
195
+ checkIsOffice();
196
 
197
 
198
  var siteName = '';
229
 
230
  $j('#order-' + target + '_address_customer_address_id').change(function(evt) {
231
 
232
+ if(this.id == 'order-billing_address_customer_address_id' && isFirstPageLoad == 0){
233
+ isFirstPageLoad = 1;
234
+ }
235
+
236
  checkIsOffice();
237
 
238
  if ($j('#' + baseFieldSelector + 'city').val() != '') {
278
 
279
 
280
  var evtTarget = $j(evt.target);
281
+
282
+
283
 
284
  if (target == 'shipping') {
285
  isFullNomenclature = shippingNomenclature;
290
  evtTarget.val('')
291
  $j('#' + baseFieldSelector + 'speedy_street_id').val('');
292
  concatenateStreetAddress();
293
+ var event = {type: 'change', target: this, srcElement: evt.target}
294
  order.changeAddressField(event)
295
  }
296
 
299
  evtTarget.val('')
300
  $j('#' + baseFieldSelector + 'speedy_street_id').val('');
301
  concatenateStreetAddress();
302
+ var event = {type: 'change', target: this, srcElement: evt.target}
303
  order.changeAddressField(event)
304
  } else if ($j('#' + baseFieldSelector + 'speedy_street_id').val() != '' && isFullNomenclature != 'FULL' && evtTarget.val() != streetName) {
305
  evtTarget.val('')
306
  $j('#' + baseFieldSelector + 'speedy_street_id').val('');
307
  concatenateStreetAddress();
308
+ var event = {type: 'change', target: this, srcElement: evt.target}
309
  order.changeAddressField(event)
310
  } else {
311
  evtTarget.val(evtTarget.val().toUpperCase())
312
  concatenateStreetAddress();
313
+ var event = {type: 'change', target: this, srcElement: evt.target}
314
  order.changeAddressField(event)
315
  }
316
 
322
  evtTarget.val('')
323
  $j('#' + baseFieldSelector + 'speedy_quarter_id').val('');
324
  concatenateStreetAddress();
325
+ var event = {type: 'change', target: this, srcElement: evt.target}
326
  order.changeAddressField(event)
327
  }
328
 
331
  evtTarget.val('')
332
  $j('#' + baseFieldSelector + 'speedy_quarter_id').val('');
333
  concatenateStreetAddress();
334
+ var event = {type: 'change', target: this, srcElement: evt.target}
335
  order.changeAddressField(event)
336
  } else if ($j('#' + baseFieldSelector + 'speedy_quarter_id').val() != '' && isFullNomenclature != 'FULL' && evtTarget.val() != quarterName) {
337
  evtTarget.val('')
338
  $j('#' + baseFieldSelector + 'speedy_quarter_id').val('');
339
  concatenateStreetAddress();
340
+ var event = {type: 'change', target: this, srcElement: evt.target}
341
  order.changeAddressField(event)
342
  } else {
343
  evtTarget.val(evtTarget.val().toUpperCase())
344
  concatenateStreetAddress();
345
+ var event = {type: 'change', target: this, srcElement: evt.target}
346
  order.changeAddressField(event)
347
  }
348
 
355
  $j('#' + baseFieldSelector + 'speedy_office_id').val('');
356
  $j('#' + baseFieldSelector + 'speedy_street_name').val('')
357
  concatenateStreetAddress();
358
+ var event = {type: 'change', target: this, srcElement: evt.target}
359
  order.changeAddressField(event)
360
  }
361
 
365
  $j('#' + baseFieldSelector + 'speedy_office_id').val('');
366
  $j('#' + baseFieldSelector + 'speedy_street_name').val('')
367
  concatenateStreetAddress();
368
+ var event = {type: 'change', target: this, srcElement: evt.target}
369
  order.changeAddressField(event)
370
  } else if ($j('#speedy_office_id').val() != '' && evtTarget.val() != officeName) {
371
  evtTarget.val('')
372
  $j('#' + baseFieldSelector + 'speedy_office_id').val('');
373
  $j('#' + baseFieldSelector + 'speedy_street_name').val('')
374
  concatenateStreetAddress();
375
+ var event = {type: 'change', target: this, srcElement: evt.target}
376
  order.changeAddressField(event)
377
  } else {
378
  evtTarget.val(evtTarget.val().toUpperCase())
379
  concatenateStreetAddress();
380
+ var event = {type: 'change', target: this, srcElement: evt.target}
381
  order.changeAddressField(event)
382
  }
383
 
384
  } else if (evtTarget.attr('id') != baseFieldSelector + 'city' && evtTarget.attr('id') != baseFieldSelector + 'speedy_office_chooser') {
385
+
386
  evtTarget.val(evtTarget.val().toUpperCase())
387
+ var event = {type: 'change', target: this, srcElement: evt.target}
388
  order.changeAddressField(event)
389
  }
390
  } else {
397
  evtTarget.val('')
398
  $j('#' + baseFieldSelector + 'speedy_street_id').val('');
399
  concatenateStreetAddress();
400
+ var event = {type: 'change', target: this, srcElement: evt.target}
401
  order.changeAddressField(event)
402
  }
403
 
406
  evtTarget.val('')
407
  $j('#' + baseFieldSelector + 'speedy_street_id').val('');
408
  concatenateStreetAddress();
409
+ var event = {type: 'change', target: this, srcElement: evt.target}
410
  order.changeAddressField(event)
411
  } else if ($j('#' + baseFieldSelector + 'speedy_street_id').val() != '' && isFullNomenclature != 'FULL' && evtTarget.val() != streetName) {
412
  evtTarget.val('')
413
  $j('#' + baseFieldSelector + 'speedy_street_id').val('');
414
  concatenateStreetAddress();
415
+ var event = {type: 'change', target: this, srcElement: evt.target}
416
  order.changeAddressField(event)
417
  } else {
418
  evtTarget.val(evtTarget.val().toUpperCase())
419
  concatenateStreetAddress();
420
+ var event = {type: 'change', target: this, srcElement: evt.target}
421
  order.changeAddressField(event)
422
  }
423
 
429
  evtTarget.val('')
430
  $j('#' + baseFieldSelector + 'speedy_quarter_id').val('');
431
  concatenateStreetAddress();
432
+ var event = {type: 'change', target: this, srcElement: evt.target}
433
  order.changeAddressField(event)
434
  }
435
 
438
  evtTarget.val('')
439
  $j('#' + baseFieldSelector + 'speedy_quarter_id').val('');
440
  concatenateStreetAddress();
441
+ var event = {type: 'change', target: this, srcElement: evt.target}
442
  order.changeAddressField(event)
443
  } else if ($j('#' + baseFieldSelector + 'speedy_quarter_id').val() != '' && isFullNomenclature != 'FULL' && evtTarget.val() != quarterName) {
444
  evtTarget.val('')
445
  $j('#' + baseFieldSelector + 'speedy_quarter_id').val('');
446
  concatenateStreetAddress();
447
+ var event = {type: 'change', target: this, srcElement: evt.target}
448
  order.changeAddressField(event)
449
  } else {
450
  evtTarget.val(evtTarget.val().toUpperCase())
451
  concatenateStreetAddress();
452
+ var event = {type: 'change', target: this, srcElement: evt.target}
453
  order.changeAddressField(event)
454
  }
455
 
462
  $j('#' + baseFieldSelector + 'speedy_office_id').val('');
463
  $j('#' + baseFieldSelector + 'speedy_street_name').val('')
464
  concatenateStreetAddress();
465
+ var event = {type: 'change', target: this, srcElement: evt.target}
466
  order.changeAddressField(event)
467
  }
468
 
472
  $j('#' + baseFieldSelector + 'speedy_office_id').val('');
473
  $j('#' + baseFieldSelector + 'speedy_street_name').val('')
474
  concatenateStreetAddress();
475
+ var event = {type: 'change', target: this, srcElement: evt.target}
476
  order.changeAddressField(event)
477
  } else if ($j('#speedy_office_id').val() != '' && evtTarget.val() != officeName) {
478
  evtTarget.val('')
479
  $j('#' + baseFieldSelector + 'speedy_office_id').val('');
480
  $j('#' + baseFieldSelector + 'speedy_street_name').val('')
481
  concatenateStreetAddress();
482
+ var event = {type: 'change', target: this, srcElement: evt.target}
483
  order.changeAddressField(event)
484
  } else {
485
  evtTarget.val(evtTarget.val().toUpperCase())
486
  concatenateStreetAddress();
487
+ var event = {type: 'change', target: this, srcElement: evt.target}
488
  order.changeAddressField(event)
489
  }
490
 
491
  } else if (evtTarget.attr('id') != baseFieldSelector + 'city' && evtTarget.attr('id') != baseFieldSelector + 'speedy_office_chooser') {
492
  evtTarget.val(evtTarget.val().toUpperCase())
493
+ var event = {type: 'change', target: this, srcElement: evt.target}
494
  order.changeAddressField(event)
495
  }
496
  }
499
  })
500
 
501
 
502
+ $j('#' + baseFieldSelector + 'city').change(function(evt) {
503
 
504
  if (siteName != $j(this).val()) {
505
 
507
  $j('#' + baseFieldSelector + 'speedy_site_id').val('')
508
  $j('#' + baseFieldSelector + 'zip').val('')
509
  updateForm(target);
510
+ var event = {type: 'change', target: this, srcElement: evt.target}
511
  order.changeAddressField(event)
512
  } else if ($j(this).val() == "") {
513
 
516
  $j('#' + baseFieldSelector + 'speedy_site_id').val('')
517
  $j('#' + baseFieldSelector + 'zip').val('')
518
  // clearForm();
519
+ var event = {type: 'change', target: this, srcElement: evt.target}
520
  order.changeAddressField(event)
521
  } else {
522
  updateForm(target, true);
625
 
626
  }
627
 
628
+ var event = {type: 'change', target: this, srcElement: evt.target}
629
  order.changeAddressField(event)
630
 
631
  });
693
  $j('#order-' + activeTarget + '_address_region').show().val(ui.item.region)
694
 
695
  concatenateStreetAddress();
696
+ var event = {type: 'change', target: this, srcElement: this}
697
  order.changeAddressField(event)
698
  $j('order-' + activeTarget + '_address_postcode').val(ui.item.post_code)
699
  if (ui.item.is_full_nomenclature == 'NO') {
758
  // concatenateStreetAddress();
759
 
760
  //do not delete this
761
+ var event = {type: 'change', target: this, srcElement: this}
762
  order.changeAddressField(event)
763
  return false;
764
  }}).focus(function() {
795
  concatenateStreetAddress();
796
  quarterName = ui.item.label;
797
  $j('#order-' + activeTarget + '_address_speedy_quarter_id').val(ui.item.value)
798
+ var event = {type: 'change', target: this, srcElement: this}
799
  order.changeAddressField(event)
800
  return false;
801
  }});
821
  concatenateStreetAddress();
822
  streetName = ui.item.label;
823
  $j('#order-' + activeTarget + '_address_speedy_street_id').val(ui.item.value)
824
+ var event = {type: 'change', target: this, srcElement: this}
825
  order.changeAddressField(event)
826
  return false;
827
  }});
850
  $j(this).val(ui.item.label);
851
  concatenateStreetAddress();
852
  // $j('#order-' + activeTarget + '_address_speedy_street_id').val(ui.item.value)
853
+ var event = {type: 'change', target: this, srcElement: this}
854
  order.changeAddressField(event)
855
  return false;
856
  }});
app/design/adminhtml/default/default/template/speedy_speedyshipping/sales/order/create/form/address.phtml~ DELETED
@@ -1,1013 +0,0 @@
1
-
2
-
3
- <?php
4
- if ($this->getIsShipping()):
5
- $_fieldsContainerId = 'order-shipping_address_fields';
6
- $_addressChoiceContainerId = 'order-shipping_address_choice';
7
- ?>
8
-
9
- <script type="text/javascript">
10
- order.shippingAddressContainer = '<?php echo $_fieldsContainerId ?>';
11
- order.setAddresses(<?php echo $this->getAddressCollectionJson() ?>);
12
- </script>
13
- <?php
14
- else:
15
-
16
-
17
-
18
-
19
-
20
- $_fieldsContainerId = 'order-billing_address_fields';
21
- $_addressChoiceContainerId = 'order-billing_address_choice';
22
- ?>
23
- <script type="text/javascript">
24
- order.billingAddressContainer = '<?php echo $_fieldsContainerId ?>';
25
- </script>
26
- <?php endif; ?>
27
- <div class="entry-edit">
28
- <h1 id="speedy_address_error" class="error-msg" style="display: none"><?php echo $this->__("Invalid Speedy Address") ?>!</h1>
29
- <div class="entry-edit-head">
30
- <h4 class="icon-head fieldset-legend <?php echo $this->getHeaderCssClass() ?>"><?php echo $this->getHeaderText() ?></h4>
31
- </div>
32
-
33
- <fieldset class="np">
34
- <div id = "<?php echo $_addressChoiceContainerId ?>" class="order-choose-address">
35
-
36
- <?php echo Mage::helper('sales')->__('Select from existing customer addresses:') ?><br/>
37
- <?php $_id = $this->getForm()->getHtmlIdPrefix() . 'customer_address_id' ?>
38
- <select id="<?php echo $_id ?>" name="<?php echo $this->getForm()->getHtmlNamePrefix() ?>[customer_address_id]" style="width:97.5%;" onchange="order.selectAddress(this, '<?php echo $_fieldsContainerId ?>')">
39
- <option value=""><?php echo Mage::helper('sales')->__('Add New Address') ?></option>
40
- <?php foreach ($this->getAddressCollection() as $_address): ?>
41
- <?php //if($this->getAddressAsString($_address)!=$this->getAddressAsString($this->getAddress())): ?>
42
- <option value="<?php echo $_address->getId() ?>"<?php if ($_address->getId() == $this->getAddressId()): ?> selected="selected"<?php endif; ?>>
43
- <?php echo $this->getAddressAsString($_address) ?>
44
- </option>
45
- <?php //endif; ?>
46
- <?php endforeach; ?>
47
-
48
- </select>
49
- <br/>
50
- <?php if ($this->getIsShipping()): ?>
51
- <input type="checkbox" id="order-shipping_same_as_billing" name="shipping_same_as_billing" onchange="order.setShippingAsBilling(this.checked)" <?php if ($this->getIsAsBilling()): ?>checked<?php endif; ?>/>
52
- <label for="order-shipping_same_as_billing" class="no-float"><?php echo Mage::helper('sales')->__('Same As Billing Address') ?></label>
53
-
54
- <?php else: ?>
55
-
56
-
57
-
58
- <?php endif; ?>
59
- </div>
60
-
61
- <div class="order-address" id="<?php echo $_fieldsContainerId ?>">
62
-
63
- <div class="content">
64
- <?php echo $this->getForm()->toHtml() ?>
65
- </div>
66
-
67
- <!--<div class="order-save-in-address-book">
68
- <input name="<?php echo $this->getForm()->getHtmlNamePrefix() ?>[save_in_address_book]" type="checkbox" id="<?php echo $this->getForm()->getHtmlIdPrefix() ?>save_in_address_book" value="1" <?php if (!$this->getDontSaveInAddressBook() && $this->getAddress()->getSaveInAddressBook()): ?> checked="checked"<?php endif; ?>/>
69
- <label for="<?php echo $this->getForm()->getHtmlIdPrefix() ?>save_in_address_book"><?php echo Mage::helper('sales')->__('Save in address book') ?></label>
70
- </div>-->
71
- </div>
72
- <div id="advice-required-entry-order[has_valid_address]" style="display: none;" class="validation-advice">Моля, въведета валиден Спиди адрес.</div>
73
-
74
- <?php $hideElement = 'address-' . ($this->getIsShipping() ? 'shipping' : 'billing') . '-overlay'; ?>
75
- <div style="display:none;" id="<?php echo $hideElement ?>" class="overlay"><span><?php echo $this->__('Shipping address selection is not applicable') ?></span></div>
76
- <script type="text/javascript">
77
- // order.bindAddressFields('<?php echo $_fieldsContainerId ?>');
78
- order.bindAddressFields('<?php echo $_addressChoiceContainerId ?>');
79
- <?php if ($this->getIsShipping() && $this->getIsAsBilling()): ?>
80
- order.disableShippingAddress(true);
81
- <?php endif; ?>
82
- </script>
83
- </fieldset>
84
- </div>
85
- <script>
86
-
87
- var city_autocomplete_url = "<?php echo Mage::helper("adminhtml")->getUrl("speedyshipping/address/getSite"); ?>"
88
- var office_autocomplete_url = "<?php echo Mage::helper("adminhtml")->getUrl("speedyshipping/address/getOffices"); ?>"
89
- var quartername_autocomplete_url = "<?php echo Mage::helper("adminhtml")->getUrl("speedyshipping/address/getQuarter"); ?>";
90
- var street_autocomplete_url = "<?php echo Mage::helper("adminhtml")->getUrl("speedyshipping/address/getStreets"); ?>";
91
- var blok_autocomplete_url = "<?php echo Mage::helper("adminhtml")->getUrl("speedyshipping/address/getBlock"); ?>";
92
-
93
- var allowForcedOfficeChoice = 0;
94
-
95
- $j('document').ready(function() {
96
- $j('button#submit_order_top_button,button.save[id!="submit_order_top_button"]').removeAttr('onclick');
97
-
98
- <?php if ($this->getIsShipping()): ?>
99
- var target = 'shipping';
100
-
101
-
102
-
103
- <?php $reqData = Mage::app()->getRequest()->getPost('order'); ?>
104
-
105
- <?php $currentAction = Mage::app()->getRequest()->getActionName(); ?>
106
- <?php if (isset($reqData['shipping_address']['speedy_office_chooser'])
107
- && $reqData['shipping_address']['speedy_office_chooser'] == 0 && $currentAction == 'loadBlock' && !$this->getIsAsBilling()): ?>
108
-
109
- //document.getElementById('order-shipping_address_speedy_office_id').value = '';
110
-
111
- <?php elseif (isset($reqData['shipping_address']['speedy_office_chooser'])
112
- &&$reqData['shipping_address']['speedy_office_chooser'] == 1): ?>
113
- allowForcedOfficeChoice = 1;
114
- <?php endif; ?>
115
-
116
- <?php else: ?>
117
- var target = 'billing';
118
- //This variable is needed in the adjacent shipping address block
119
- var shippingSiteNomenclature = null;
120
- <?php endif; ?>
121
-
122
- $j('#order-'+target+'_address_street0').parentsUntil('tr').parent().hide()
123
- var isFullNomenclature = 0;
124
-
125
- var isShippingSameAsBilling = $j('#order-shipping_same_as_billing').is(':checked');
126
-
127
- var shouldAddressBeDisabled = $j('#order-' + target + '_address_customer_address_id').val();
128
- if (shouldAddressBeDisabled) {
129
- updateForm(target, null, true);
130
-
131
- $j('#order-'+target+'_address_city').attr('readonly','readonly');
132
- $j('#order-'+target+'_address_speedy_office_chooser').attr('disabled','disabled')
133
- }else{
134
- if(target== 'shipping' && !isShippingSameAsBilling){
135
-
136
- updateForm(target, true);
137
- $j('#order-'+target+'_address_city').removeAttr('readonly');
138
- }else{
139
- updateForm(target, null, true);
140
- }
141
- }
142
-
143
- /*
144
- if(isShippingSameAsBilling){
145
- updateForm(target,true)
146
- }
147
- */
148
- var baseFormSelector = 'div#order-' + target + '_address_fields';
149
- var baseFieldSelector = 'order-' + target + '_address_';
150
-
151
-
152
-
153
- function checkIsOffice() {
154
-
155
-
156
- if ($j('#' + baseFieldSelector + 'speedy_office_id').val() != false) {
157
-
158
- $j('#' + baseFieldSelector + 'speedy_office_chooser').val(1)
159
- officeName = $j('#' + baseFieldSelector + 'speedy_street_name').val();
160
- $j('#' + baseFieldSelector + 'speedy_office_name').val($j('#' + baseFieldSelector + 'speedy_street_name').val())
161
- $j('#order-' + target + '_address_speedy_street_name').attr('readonly', 'readonly')
162
- } else if (allowForcedOfficeChoice) {
163
- $j('#' + baseFieldSelector + 'speedy_office_chooser').val(1)
164
- $j('#order-' + target + '_address_speedy_street_name').removeAttr('readonly');
165
- $j('#' + baseFieldSelector + 'speedy_office_id').val('')
166
- }
167
-
168
- else {
169
-
170
- $j('#' + baseFieldSelector + 'speedy_office_chooser').val(0)
171
-
172
- $j('#' + baseFieldSelector + 'speedy_office_id').val('')
173
-
174
- //$j('#order-' + target + '_address_speedy_street_name').removeAttr('readonly');
175
- }
176
- }
177
-
178
- checkIsOffice();
179
-
180
-
181
- var siteName = '';
182
-
183
- if ($j('#' + baseFieldSelector + 'city').val() != '') {
184
-
185
- siteName = $j('#' + baseFieldSelector + 'city').val();
186
-
187
- }
188
-
189
- var quarterName = '';
190
-
191
- if ($j('#' + baseFieldSelector + 'speedy_quarter_name').val() != '') {
192
- quarterName = $j('#' + baseFieldSelector + 'speedy_quarter_name').val();
193
- }
194
-
195
- var streetName = '';
196
- if ($j('#' + baseFieldSelector + 'speedy_street_name').val() != '') {
197
- streetName = $j('#' + baseFieldSelector + 'speedy_street_name').val();
198
- }
199
-
200
- var blokName = '';
201
-
202
- if ($j('#' + baseFieldSelector + 'speedy_block_number').val() != '') {
203
- blokName = $j('#' + baseFieldSelector + 'speedy_block_number').val();
204
- }
205
-
206
- var officeName = '';
207
-
208
- if ($j('#' + baseFieldSelector + 'speedy_office_locator').val() != '') {
209
- officeName = $j('#' + baseFieldSelector + 'speedy_office_locator').val();
210
- }
211
-
212
-
213
- $j('#order-' + target + '_address_customer_address_id').change(function(evt) {
214
-
215
- checkIsOffice();
216
-
217
- if ($j('#' + baseFieldSelector + 'city').val() != '') {
218
-
219
- siteName = $j('#' + baseFieldSelector + 'city').val();
220
-
221
- }
222
-
223
- if ($j('#' + baseFieldSelector + 'speedy_quarter_name').val() != '') {
224
- quarterName = $j('#' + baseFieldSelector + 'speedy_quarter_name').val();
225
-
226
- }
227
-
228
- if ($j('#' + baseFieldSelector + 'speedy_street_name').val() != '') {
229
- streetName = $j('#' + baseFieldSelector + 'speedy_street_name').val();
230
- }
231
-
232
- if ($j('#order-' + target + '_address_speedy_office_chooser').val() == false) {
233
- showSpeedyAddressFields();
234
- } else {
235
- hideSpeedyAddressFields();
236
- }
237
-
238
- if(!$j(this).val()){
239
- $j('#order-'+target+'_address_city').removeAttr('readonly');
240
- }else{
241
- $j('#order-'+target+'_address_city').attr('readonly','readonly');
242
- }
243
-
244
-
245
- })
246
-
247
- /*
248
- $j('#order-'+target+'_address_customer_address_id').change(function(evt){
249
- updateForm(target,true)
250
- })
251
- */
252
-
253
- var textFieldBlurSelector = baseFormSelector + " input[id*=\"speedy\"],#" + baseFieldSelector + "speedy_street_name"
254
-
255
- var selector = '#order-' + target + '_address_fields input,#order-' + target + '_address_fields select';
256
- $j(selector).change(function(evt) {
257
-
258
-
259
- var evtTarget = $j(evt.target);
260
-
261
- if (target == 'shipping') {
262
- isFullNomenclature = shippingNomenclature;
263
- if (evtTarget.attr('id') == baseFieldSelector + 'speedy_street_name') {
264
-
265
- if (isFullNomenclature == 'FULL' && $j('#' + baseFieldSelector + 'speedy_street_id').val() == false) {
266
-
267
- evtTarget.val('')
268
- $j('#' + baseFieldSelector + 'speedy_street_id').val('');
269
- concatenateStreetAddress();
270
- var event = {type: 'change', target: this}
271
- order.changeAddressField(event)
272
- }
273
-
274
-
275
- else if (evtTarget.val() != streetName && isFullNomenclature == 'FULL') {
276
- evtTarget.val('')
277
- $j('#' + baseFieldSelector + 'speedy_street_id').val('');
278
- concatenateStreetAddress();
279
- var event = {type: 'change', target: this}
280
- order.changeAddressField(event)
281
- } else if ($j('#' + baseFieldSelector + 'speedy_street_id').val() != '' && isFullNomenclature != 'FULL' && evtTarget.val() != streetName) {
282
- evtTarget.val('')
283
- $j('#' + baseFieldSelector + 'speedy_street_id').val('');
284
- concatenateStreetAddress();
285
- var event = {type: 'change', target: this}
286
- order.changeAddressField(event)
287
- } else {
288
- evtTarget.val(evtTarget.val().toUpperCase())
289
- concatenateStreetAddress();
290
- var event = {type: 'change', target: this}
291
- order.changeAddressField(event)
292
- }
293
-
294
-
295
- } else if (evtTarget.attr('id') == baseFieldSelector + 'speedy_quarter_name') {
296
-
297
-
298
- if (isFullNomenclature == 'FULL' && $j('#' + baseFieldSelector + 'speedy_quarter_id').val() == false) {
299
- evtTarget.val('')
300
- $j('#' + baseFieldSelector + 'speedy_quarter_id').val('');
301
- concatenateStreetAddress();
302
- var event = {type: 'change', target: this}
303
- order.changeAddressField(event)
304
- }
305
-
306
-
307
- else if (evtTarget.val() != quarterName && isFullNomenclature == 'FULL') {
308
- evtTarget.val('')
309
- $j('#' + baseFieldSelector + 'speedy_quarter_id').val('');
310
- concatenateStreetAddress();
311
- var event = {type: 'change', target: this}
312
- order.changeAddressField(event)
313
- } else if ($j('#' + baseFieldSelector + 'speedy_quarter_id').val() != '' && isFullNomenclature != 'FULL' && evtTarget.val() != quarterName) {
314
- evtTarget.val('')
315
- $j('#' + baseFieldSelector + 'speedy_quarter_id').val('');
316
- concatenateStreetAddress();
317
- var event = {type: 'change', target: this}
318
- order.changeAddressField(event)
319
- } else {
320
- evtTarget.val(evtTarget.val().toUpperCase())
321
- concatenateStreetAddress();
322
- var event = {type: 'change', target: this}
323
- order.changeAddressField(event)
324
- }
325
-
326
-
327
- } else if (evtTarget.attr('id') == baseFieldSelector + 'speedy_office_name') {
328
-
329
-
330
- if ($j('#' + baseFieldSelector + 'speedy_office_id').val() == false) {
331
- evtTarget.val('')
332
- $j('#' + baseFieldSelector + 'speedy_office_id').val('');
333
- $j('#' + baseFieldSelector + 'speedy_street_name').val('')
334
- concatenateStreetAddress();
335
- var event = {type: 'change', target: this}
336
- order.changeAddressField(event)
337
- }
338
-
339
-
340
- else if (evtTarget.val() != officeName) {
341
- evtTarget.val('')
342
- $j('#' + baseFieldSelector + 'speedy_office_id').val('');
343
- $j('#' + baseFieldSelector + 'speedy_street_name').val('')
344
- concatenateStreetAddress();
345
- var event = {type: 'change', target: this}
346
- order.changeAddressField(event)
347
- } else if ($j('#speedy_office_id').val() != '' && evtTarget.val() != officeName) {
348
- evtTarget.val('')
349
- $j('#' + baseFieldSelector + 'speedy_office_id').val('');
350
- $j('#' + baseFieldSelector + 'speedy_street_name').val('')
351
- concatenateStreetAddress();
352
- var event = {type: 'change', target: this}
353
- order.changeAddressField(event)
354
- } else {
355
- evtTarget.val(evtTarget.val().toUpperCase())
356
- concatenateStreetAddress();
357
- var event = {type: 'change', target: this}
358
- order.changeAddressField(event)
359
- }
360
-
361
- } else if (evtTarget.attr('id') != baseFieldSelector + 'city' && evtTarget.attr('id') != baseFieldSelector + 'speedy_office_chooser') {
362
- evtTarget.val(evtTarget.val().toUpperCase())
363
- var event = {type: 'change', target: this}
364
- order.changeAddressField(event)
365
- }
366
- } else {
367
-
368
-
369
- if (evtTarget.attr('id') == baseFieldSelector + 'speedy_street_name') {
370
-
371
- if (isFullNomenclature == 'FULL' && $j('#' + baseFieldSelector + 'speedy_street_id').val() == false) {
372
-
373
- evtTarget.val('')
374
- $j('#' + baseFieldSelector + 'speedy_street_id').val('');
375
- concatenateStreetAddress();
376
- var event = {type: 'change', target: this}
377
- order.changeAddressField(event)
378
- }
379
-
380
-
381
- else if (evtTarget.val() != streetName && isFullNomenclature == 'FULL') {
382
- evtTarget.val('')
383
- $j('#' + baseFieldSelector + 'speedy_street_id').val('');
384
- concatenateStreetAddress();
385
- var event = {type: 'change', target: this}
386
- order.changeAddressField(event)
387
- } else if ($j('#' + baseFieldSelector + 'speedy_street_id').val() != '' && isFullNomenclature != 'FULL' && evtTarget.val() != streetName) {
388
- evtTarget.val('')
389
- $j('#' + baseFieldSelector + 'speedy_street_id').val('');
390
- concatenateStreetAddress();
391
- var event = {type: 'change', target: this}
392
- order.changeAddressField(event)
393
- } else {
394
- evtTarget.val(evtTarget.val().toUpperCase())
395
- concatenateStreetAddress();
396
- var event = {type: 'change', target: this}
397
- order.changeAddressField(event)
398
- }
399
-
400
-
401
- } else if (evtTarget.attr('id') == baseFieldSelector + 'speedy_quarter_name') {
402
-
403
-
404
- if (isFullNomenclature == 'FULL' && $j('#' + baseFieldSelector + 'speedy_quarter_id').val() == false) {
405
- evtTarget.val('')
406
- $j('#' + baseFieldSelector + 'speedy_quarter_id').val('');
407
- concatenateStreetAddress();
408
- var event = {type: 'change', target: this}
409
- order.changeAddressField(event)
410
- }
411
-
412
-
413
- else if (evtTarget.val() != quarterName && isFullNomenclature == 'FULL') {
414
- evtTarget.val('')
415
- $j('#' + baseFieldSelector + 'speedy_quarter_id').val('');
416
- concatenateStreetAddress();
417
- var event = {type: 'change', target: this}
418
- order.changeAddressField(event)
419
- } else if ($j('#' + baseFieldSelector + 'speedy_quarter_id').val() != '' && isFullNomenclature != 'FULL' && evtTarget.val() != quarterName) {
420
- evtTarget.val('')
421
- $j('#' + baseFieldSelector + 'speedy_quarter_id').val('');
422
- concatenateStreetAddress();
423
- var event = {type: 'change', target: this}
424
- order.changeAddressField(event)
425
- } else {
426
- evtTarget.val(evtTarget.val().toUpperCase())
427
- concatenateStreetAddress();
428
- var event = {type: 'change', target: this}
429
- order.changeAddressField(event)
430
- }
431
-
432
-
433
- } else if (evtTarget.attr('id') == baseFieldSelector + 'speedy_office_name') {
434
-
435
-
436
- if ($j('#' + baseFieldSelector + 'speedy_office_id').val() == false) {
437
- evtTarget.val('')
438
- $j('#' + baseFieldSelector + 'speedy_office_id').val('');
439
- $j('#' + baseFieldSelector + 'speedy_street_name').val('')
440
- concatenateStreetAddress();
441
- var event = {type: 'change', target: this}
442
- order.changeAddressField(event)
443
- }
444
-
445
-
446
- else if (evtTarget.val() != officeName) {
447
- evtTarget.val('')
448
- $j('#' + baseFieldSelector + 'speedy_office_id').val('');
449
- $j('#' + baseFieldSelector + 'speedy_street_name').val('')
450
- concatenateStreetAddress();
451
- var event = {type: 'change', target: this}
452
- order.changeAddressField(event)
453
- } else if ($j('#speedy_office_id').val() != '' && evtTarget.val() != officeName) {
454
- evtTarget.val('')
455
- $j('#' + baseFieldSelector + 'speedy_office_id').val('');
456
- $j('#' + baseFieldSelector + 'speedy_street_name').val('')
457
- concatenateStreetAddress();
458
- var event = {type: 'change', target: this}
459
- order.changeAddressField(event)
460
- } else {
461
- evtTarget.val(evtTarget.val().toUpperCase())
462
- concatenateStreetAddress();
463
- var event = {type: 'change', target: this}
464
- order.changeAddressField(event)
465
- }
466
-
467
- } else if (evtTarget.attr('id') != baseFieldSelector + 'city' && evtTarget.attr('id') != baseFieldSelector + 'speedy_office_chooser') {
468
- evtTarget.val(evtTarget.val().toUpperCase())
469
- var event = {type: 'change', target: this}
470
- order.changeAddressField(event)
471
- }
472
- }
473
- //concatenateStreetAddress();
474
-
475
- })
476
-
477
-
478
- $j('#' + baseFieldSelector + 'city').change(function() {
479
-
480
- if (siteName != $j(this).val()) {
481
-
482
- $j(this).val('')
483
- $j('#' + baseFieldSelector + 'speedy_site_id').val('')
484
- $j('#' + baseFieldSelector + 'zip').val('')
485
- updateForm(target);
486
- var event = {type: 'change', target: this}
487
- order.changeAddressField(event)
488
- } else if ($j(this).val() == "") {
489
-
490
- updateForm(target);
491
- ;
492
- $j('#' + baseFieldSelector + 'speedy_site_id').val('')
493
- $j('#' + baseFieldSelector + 'zip').val('')
494
- // clearForm();
495
- var event = {type: 'change', target: this}
496
- order.changeAddressField(event)
497
- } else {
498
- updateForm(target, true);
499
- }
500
- })
501
-
502
- $j('#order-' + target + '_address_street1').hide();
503
- var possibleAddressSources = ['billing', 'shipping'];
504
-
505
- var isValidAddress = $j('#order-' + target + '_address_customer_address_id').val();
506
- var test = [<?php echo $this->getValidAddressIds(); ?>];
507
- var cityName = null;
508
- checkAddress();
509
-
510
-
511
- function checkAddress() {
512
-
513
- var showError = true;
514
-
515
- for (var i = 0; i < test.length; i++) {
516
-
517
-
518
- if (test[i] == isValidAddress || isValidAddress == "") {
519
-
520
- $j('#speedy_address_error').hide();
521
- $j('#speedy_shipping_address_error').hide()
522
- showError = false;
523
- break;
524
- }
525
-
526
- }
527
-
528
- if (showError) {
529
-
530
- $j('#speedy_address_error').show();
531
- $j('#speedy_shipping_address_error').show()
532
-
533
- }
534
-
535
- }
536
-
537
-
538
- _initListeners(target);
539
-
540
- initOfficeChooser(target);
541
-
542
-
543
- var isCityEmpty = $j('#order-' + target + '_address_city,#order-shipping_address_city').val();
544
-
545
- var showOffice = $j('#order-' + target + '_address_speedy_office_chooser').val();
546
-
547
-
548
- if (showOffice != 0) {
549
-
550
- hideSpeedyAddressFields()
551
- } else {
552
-
553
- showSpeedyAddressFields()
554
- }
555
-
556
-
557
- if (isCityEmpty == "") {
558
-
559
- updateForm(target)
560
-
561
- }
562
-
563
- function initOfficeChooser(target) {
564
-
565
- $j('#order-' + target + '_address_speedy_office_chooser').change(function(evt) {
566
-
567
-
568
-
569
-
570
- if ($j(this).val() != false) {
571
-
572
- hideSpeedyAddressFields()
573
-
574
- var zipCode = $j('#order-'+target+'_address_postcode').val();
575
- var regionCode = $j('#order-'+target+'_address_region').val();
576
-
577
- updateForm(target)
578
- $j('#order-'+target+'_address_postcode').val(zipCode)
579
- $j('#order-'+target+'_address_region').val(regionCode);
580
-
581
- $j(this).removeAttr('disabled')
582
- $j('#order-' + target + '_address_speedy_office_name').removeAttr('readonly')
583
-
584
- } else {
585
-
586
- $j('#order-' + target + '_address_speedy_street_name').val('');
587
- $j('#order-' + target + '_address_speedy_office_name').val('')
588
- $j('#order-' + target + '_address_speedy_office_id').val('');
589
-
590
- var zipCode = $j('#order-'+target+'_address_postcode').val();
591
- var regionCode = $j('#order-'+target+'_address_region').val();
592
-
593
- updateForm(target,true);
594
- $j('#order-'+target+'_address_postcode').val(zipCode)
595
- $j('#order-'+target+'_address_region').val(regionCode);
596
-
597
- showSpeedyAddressFields();
598
- concatenateStreetAddress();
599
-
600
-
601
-
602
- }
603
-
604
- var event = {type: 'change', target: this}
605
- order.changeAddressField(event)
606
-
607
- });
608
- }
609
-
610
- function hideSpeedyAddressFields() {
611
-
612
- var selector = '#order-' + target + '_address_fields input[id*="speedy"]';
613
-
614
- $j(selector).not(':hidden').hide().closest('tr').hide()
615
- $j('#order-' + target + '_address_speedy_office_name').show().closest('tr').show()
616
- }
617
- function showSpeedyAddressFields() {
618
- $j('#order-' + target + '_address input[id*="speedy"]').show().closest('tr').show()
619
- $j('#order-' + target + '_address_speedy_office_name').hide().closest('tr').hide()
620
- }
621
-
622
-
623
- function _initListeners(activeTarget) {
624
-
625
-
626
- $j('#order-' + activeTarget + '_address_customer_address_id').change(function(evt) {
627
- isValidAddress = $j(this).val();
628
- if (isValidAddress) {
629
-
630
- updateForm(activeTarget, null, true)
631
- } else {
632
- updateForm(activeTarget, true)
633
- }
634
-
635
- checkAddress();
636
-
637
- })
638
-
639
- $j('#order-' + activeTarget + '_address_city').autocomplete({
640
- source: function(request, response) {
641
-
642
- $j.ajax({
643
- url: city_autocomplete_url,
644
- dataType: "json",
645
- data: {
646
- term: request.term
647
- },
648
- success: function(data) {
649
-
650
- response(data);
651
- }
652
- });
653
- }
654
- , minLength: 3
655
- , select: function(event, ui) {
656
-
657
- updateForm(activeTarget)
658
- updateForm(activeTarget, true);
659
- // clearForm();
660
- $j(this).val(ui.item.label);
661
- siteName = ui.item.label;
662
- $j('#order-' + activeTarget + '_address_speedy_site_id').val(ui.item.value)
663
- $j('#order-' + activeTarget + '_address_postcode').val(ui.item.post_code)
664
-
665
- $j('#order-' + activeTarget + '_address_country_id').val('BG');
666
-
667
- $j('#order-' + activeTarget + '_address_region_id').removeClass('required-entry validate-select validation-failed').hide();
668
-
669
- $j('#order-' + activeTarget + '_address_region').show().val(ui.item.region)
670
-
671
- concatenateStreetAddress();
672
- var event = {type: 'change', target: this}
673
- order.changeAddressField(event)
674
- $j('order-' + activeTarget + '_address_postcode').val(ui.item.post_code)
675
- if (ui.item.is_full_nomenclature == 'NO') {
676
- if (target == 'shipping') {
677
-
678
- shippingNomenclature = 'NO';
679
- }
680
- isFullNomenclature = 'NO';
681
- disableAutocomplete()
682
- } else if (ui.item.is_full_nomenclature == 'PARTIAL') {
683
-
684
- isFullNomenclature = 'PARTIAL';
685
-
686
- if (target == 'shipping') {
687
- shippingNomenclature = 'PARTIAL';
688
- }
689
-
690
- enableAutocomplete();
691
- } else {
692
- isFullNomenclature = 'FULL';
693
- if (target == 'shipping') {
694
- shippingNomenclature = 'FULL';
695
- }
696
- enableAutocomplete();
697
-
698
- }
699
-
700
- return false;
701
- }});
702
-
703
-
704
- $j('#order-' + activeTarget + '_address_speedy_office_name').autocomplete({
705
- source: function(request, response) {
706
-
707
- $j.ajax({
708
- url: office_autocomplete_url,
709
- dataType: "json",
710
- data: {
711
- term: request.term,
712
- cityid: $j('#order-' + activeTarget + '_address_speedy_site_id').val()
713
- },
714
- success: function(data) {
715
- response(data);
716
- }
717
- });
718
- }
719
- , minLength: 0
720
- , select: function(event, ui) {
721
- $j(this).val(ui.item.label);
722
- officeName = ui.item.label;
723
- concatenateStreetAddress();
724
- $j('#order-' + activeTarget + '_address_speedy_office_id').val(ui.item.value);
725
- $j('#order-' + activeTarget + '_address_speedy_street_name').val(ui.item.label).attr('readonly', 'readonly');
726
- $j('#order-' + activeTarget + '_address_street0').val(ui.item.label)
727
- // concatenateStreetAddress();
728
-
729
- //do not delete this
730
- var event = {type: 'change', target: this}
731
- order.changeAddressField(event)
732
- return false;
733
- }}).focus(function() {
734
-
735
- if ($j('#order-' + activeTarget + '_address_speedy_site_id').val()) {
736
- //Use the below line instead of triggering keydown
737
- $j(this).autocomplete("search")
738
-
739
- return false;
740
- }
741
- });
742
-
743
-
744
-
745
-
746
- $j('#order-' + activeTarget + '_address_speedy_quarter_name').autocomplete({
747
- source: function(request, response) {
748
-
749
- $j.ajax({
750
- url: quartername_autocomplete_url,
751
- dataType: "json",
752
- data: {
753
- term: request.term,
754
- cityid: $j('#order-' + activeTarget + '_address_speedy_site_id').val()
755
- },
756
- success: function(data) {
757
- response(data);
758
- }
759
- });
760
- }
761
- , minLength: 3
762
- , select: function(event, ui) {
763
- $j(this).val(ui.item.label);
764
- concatenateStreetAddress();
765
- quarterName = ui.item.label;
766
- $j('#order-' + activeTarget + '_address_speedy_quarter_id').val(ui.item.value)
767
- var event = {type: 'change', target: this}
768
- order.changeAddressField(event)
769
- return false;
770
- }});
771
-
772
- $j('#order-' + activeTarget + '_address_speedy_street_name').autocomplete({
773
- source: function(request, response) {
774
-
775
- $j.ajax({
776
- url: street_autocomplete_url,
777
- dataType: "json",
778
- data: {
779
- term: request.term,
780
- cityid: $j('#order-' + activeTarget + '_address_speedy_site_id').val()
781
- },
782
- success: function(data) {
783
- response(data);
784
- }
785
- });
786
- }
787
- , minLength: 3
788
- , select: function(event, ui) {
789
- $j(this).val(ui.item.label);
790
- concatenateStreetAddress();
791
- streetName = ui.item.label;
792
- $j('#order-' + activeTarget + '_address_speedy_street_id').val(ui.item.value)
793
- var event = {type: 'change', target: this}
794
- order.changeAddressField(event)
795
- return false;
796
- }});
797
-
798
-
799
-
800
-
801
-
802
- $j('#order-' + activeTarget + '_address_speedy_block_number').autocomplete({
803
- source: function(request, response) {
804
-
805
- $j.ajax({
806
- url: blok_autocomplete_url,
807
- dataType: "json",
808
- data: {
809
- term: request.term,
810
- cityid: $j('#order-' + activeTarget + '_address_speedy_site_id').val()
811
- },
812
- success: function(data) {
813
- response(data);
814
- }
815
- });
816
- }
817
- , minLength: 3
818
- , select: function(event, ui) {
819
- $j(this).val(ui.item.label);
820
- concatenateStreetAddress();
821
- // $j('#order-' + activeTarget + '_address_speedy_street_id').val(ui.item.value)
822
- var event = {type: 'change', target: this}
823
- order.changeAddressField(event)
824
- return false;
825
- }});
826
-
827
-
828
- var selector = '#' + baseFieldSelector + 'speedy_street_number,' +
829
- '#' + baseFieldSelector + 'speedy_block_number,' +
830
- '#' + baseFieldSelector + 'speedy_address_note,' +
831
- '#' + baseFieldSelector + 'speedy_floor,' +
832
- '#' + baseFieldSelector + 'speedy_entrance,' +
833
- '#' + baseFieldSelector + 'speedy_apartment'
834
- $j(selector).keyup(function() {
835
- concatenateStreetAddress();
836
-
837
- })
838
-
839
- }
840
-
841
-
842
- $j('#order-' + target + '_address_speedy_office_chooser').change(function(evt) {
843
- if (isShippingSameAsBilling) {
844
-
845
-
846
-
847
- $j('#order-billing_address_street0').val('');
848
- $j('#order-shipping_address_street0').val('');
849
-
850
- } else {
851
- $j('#order-' + target + '_address_street0').val('');
852
- }
853
- })
854
-
855
-
856
- function concatenateStreetAddress() {
857
-
858
- var quarter = $j('#' + baseFieldSelector + 'speedy_quarter_name').val();
859
- var quarter_id = $j('#' + baseFieldSelector + 'speedy_quarter_id').val();
860
- var street = $j('#' + baseFieldSelector + 'speedy_street_name').val();
861
- var street_id = $j('#' + baseFieldSelector + 'speedy_street_id').val();
862
- var number = $j('#' + baseFieldSelector + 'speedy_street_number').val();
863
- var blockNo = $j('#' + baseFieldSelector + 'speedy_block_number').val();
864
- var address_note = $j('#' + baseFieldSelector + 'speedy_address_note').val();
865
-
866
- var floor_no = $j('#' + baseFieldSelector + 'speedy_floor').val();
867
- var entrance = $j('#' + baseFieldSelector + 'speedy_entrance').val();
868
- var apartment = $j('#' + baseFieldSelector + 'speedy_apartment').val();
869
-
870
- var speedy_pick_from_office = $j('#' + baseFieldSelector + 'speedy_office_chooser').val();
871
- var speedy_office_name = $j('#' + baseFieldSelector + 'speedy_office_name').val();
872
- var speedy_office_id = $j('#' + baseFieldSelector + 'speedy_office_id').val();
873
-
874
-
875
- var streetAddress = '';
876
-
877
- var address = '';
878
- var note = '';
879
-
880
- var streetAddress = '';
881
-
882
- if (speedy_office_name.length > 1) {
883
- //address += speedy_office_name;
884
- }
885
-
886
- if (quarter.length > 1) {
887
- address += ' ' + quarter;
888
- }
889
- if (street.length > 1) {
890
- address += ' ' + street;
891
- }
892
- if (number.length >= 1) {
893
- address += " <?php echo $this->__("Street Number") ?>" + number;
894
- }
895
- if (blockNo.length >= 1) {
896
- address += " <?php echo $this->__("Blok") ?>" + blockNo;
897
- }
898
-
899
- if (entrance.length >= 1) {
900
- address += " <?php echo $this->__("Entrance") ?>" + entrance;
901
- }
902
- if (floor_no.length >= 1) {
903
- address += " <?php echo $this->__("Floor") ?>" + floor_no;
904
- }
905
- if (apartment.length >= 1) {
906
- address += " <?php echo $this->__("Apartment") ?>" + apartment;
907
- }
908
-
909
- if (address_note.length > 3) {
910
- note += "" + address_note;
911
- }
912
-
913
- streetAddress = address;
914
-
915
- if (note != '') {
916
- streetAddress += ', ' + note;
917
- }
918
-
919
- var isShippingSameAsBilling = $j('#order-shipping_same_as_billing').is(':checked')
920
-
921
- if (isShippingSameAsBilling) {
922
-
923
-
924
- $j('#order-billing_address_street0').val(streetAddress);
925
- $j('#order-shipping_address_street0').val(streetAddress);
926
-
927
- } else {
928
-
929
-
930
- $j('#order-' + target + '_address_street0').val(streetAddress);
931
- }
932
-
933
-
934
- }
935
-
936
- function updateForm(activeTarget, enable, clear) {
937
- if (enable) {
938
-
939
- $j('#order-' + activeTarget + '_address_speedy_street_name,#order-' + activeTarget + '_address_street1,\n\
940
- #order-' + activeTarget + '_address_speedy_street_id,#order-' + activeTarget + '_address_speedy_quarter_name,\n\
941
- #order-' + activeTarget + '_address_speedy_quarter_id,\n\
942
- #order-' + activeTarget + '_address_speedy_street_number,\n\
943
- #order-' + activeTarget + '_address_speedy_block_number,\n\
944
- #order-' + activeTarget + '_address_speedy_entrance,\n\
945
- #order-' + activeTarget + '_address_speedy_floor,\n\
946
- #order-' + activeTarget + '_address_speedy_apartment,\n\
947
- #order-' + activeTarget + '_address_speedy_address_note,\n\
948
- #order-' + activeTarget + '_address_region,\n\
949
- #order-' + activeTarget + '_address_postcode,\n\
950
- #order-' + activeTarget + '_address_street0,\n\
951
- #order-' + activeTarget + '_address_speedy_office_name,\n\
952
- #order-' + activeTarget + '_address_speedy_office_id')
953
- .removeAttr('readonly');
954
- $j('#order-'+activeTarget+'_address_speedy_office_chooser').removeAttr('disabled')
955
- } else if (clear) {
956
- $j('#order-' + activeTarget + '_address_speedy_street_name,#order-' + activeTarget + '_address_street1,\n\
957
- #order-' + activeTarget + '_address_speedy_street_id,#order-' + activeTarget + '_address_speedy_quarter_name,\n\
958
- #order-' + activeTarget + '_address_speedy_quarter_id,\n\
959
- #order-' + activeTarget + '_address_speedy_street_number,\n\
960
- #order-' + activeTarget + '_address_speedy_block_number,\n\
961
- #order-' + activeTarget + '_address_speedy_entrance,\n\
962
- #order-' + activeTarget + '_address_speedy_floor,\n\
963
- #order-' + activeTarget + '_address_speedy_apartment,\n\
964
- #order-' + activeTarget + '_address_speedy_address_note,\n\
965
- #order-' + activeTarget + '_address_region,\n\
966
- #order-' + activeTarget + '_address_postcode,\n\
967
- #order-' + activeTarget + '_address_street0,\n\
968
- #order-' + activeTarget + '_address_speedy_office_name,\n\
969
- #order-' + activeTarget + '_address_speedy_office_id')
970
- .attr('readonly', 'readonly');
971
- $j('#order-'+activeTarget+'_address_speedy_office_chooser').attr('disabled','disabled')
972
- }
973
- else {
974
-
975
- $j('#order-' + activeTarget + '_address_speedy_street_name,#order-' + activeTarget + '_address_street1,\n\
976
- #order-' + activeTarget + '_address_speedy_street_id,#order-' + activeTarget + '_address_speedy_quarter_name,\n\
977
- #order-' + activeTarget + '_address_speedy_quarter_id,\n\
978
- #order-' + activeTarget + '_address_speedy_street_number,\n\
979
- #order-' + activeTarget + '_address_speedy_block_number,\n\
980
- #order-' + activeTarget + '_address_speedy_entrance,\n\
981
- #order-' + activeTarget + '_address_speedy_floor,\n\
982
- #order-' + activeTarget + '_address_speedy_apartment,\n\
983
- #order-' + activeTarget + '_address_speedy_address_note,\n\
984
- #order-' + activeTarget + '_address_region,\n\
985
- #order-' + activeTarget + '_address_postcode,\n\
986
- #order-' + activeTarget + '_address_street0,\n\
987
- #order-' + activeTarget + '_address_speedy_office_name,\n\
988
- #order-' + activeTarget + '_address_speedy_office_id')
989
- .attr('readonly', 'readonly').val('');
990
- $j('#order-'+activeTarget+'_address_speedy_office_chooser').attr('disabled','disabled')
991
-
992
- }
993
-
994
- }
995
-
996
- function enableAutocomplete() {
997
- //var selectorPrefix = "#order-" + activeTarget+"_address_";
998
-
999
-
1000
- $j("#order-" + target + "_address_speedy_quarter_name,\n\
1001
- #order-" + target + "_address_speedy_street_name,\n\
1002
- #order-" + target + "_address_speedy_office_name ").autocomplete("option", "disabled", false);
1003
- }
1004
-
1005
- function disableAutocomplete() {
1006
- $j("#order-" + target + "_address_speedy_quarter_name,\n\
1007
- #order-" + target + "_address_speedy_street_name,\n\
1008
- #order-" + target + "_address_speedy_office_name ").autocomplete("option", "disabled", true);
1009
- }
1010
-
1011
-
1012
- })
1013
- </script>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/design/adminhtml/default/default/template/speedy_speedyshipping/sales/order/create/shipping/method/form.phtml~ DELETED
@@ -1,299 +0,0 @@
1
- <script type="text/javascript">
2
- <?php if ($this->helper('tax')->displayShippingPriceExcludingTax()): ?>
3
- var excludeTax = <?php echo $this->helper('tax')->displayShippingPriceExcludingTax() ?>;
4
- <?php else: ?>
5
- var excludeTax = null;
6
- <?php endif; ?>
7
-
8
- <?php if ($this->helper('tax')->displayShippingPriceIncludingTax()): ?>
9
- var includeTax = <?php echo $this->helper('tax')->displayShippingPriceIncludingTax() ?>;
10
- <?php else: ?>
11
- var includeTax = null;
12
- <?php endif; ?>
13
-
14
-
15
- <?php if ($this->helper('tax')->displayShippingBothPrices()): ?>
16
- var showBoth = <?php echo $this->helper('tax')->displayShippingBothPrices() ?>;
17
- <?php else: ?>
18
- var showBoth = null;
19
- <?php endif; ?>
20
- </script>
21
- <?php if (Mage::getSingleton('adminhtml/session')->getSpeedyError()): ?>
22
- <p><?php echo $this->__("The following products has no weight assiged"); ?></p>
23
- <h1><?php echo Mage::getSingleton('adminhtml/session')->getSpeedyError() ?></h1>
24
- <?php Mage::getSingleton('adminhtml/session')->unsSpeedyError() ?>
25
- <?php endif; ?>
26
- <?php $_shippingRateGroups = $this->getShippingRates(); ?>
27
- <?php if ($_shippingRateGroups): ?>
28
- <div id="order-shipping-method-choose" style="display:none">
29
- <dl class="shipment-methods">
30
- <?php foreach ($_shippingRateGroups as $code => $_rates): ?>
31
- <dt><strong><?php echo $this->escapeHtml($this->getCarrierName($code)) ?></strong></dt>
32
- <dd>
33
- <ul>
34
- <?php foreach ($_rates as $_rate): ?>
35
- <?php if ($_rate->getSpeedyAmountFixedHourWithoutTax()): ?>
36
- <?php endif; ?>
37
-
38
- <?php $_radioProperty = 'name="order[shipping_method]" type="radio"' ?>
39
- <?php $_code = $_rate->getCode() ?>
40
- <li>
41
- <?php if ($_rate->getErrorMessage()): ?>
42
- <ul class="messages">
43
- <li class="error-msg"><?php echo $this->escapeHtml($_rate->getErrorMessage()) ?></li>
44
- </ul>
45
- <?php else: ?>
46
- <?php $_checked = $this->isMethodActive($_code) ? 'checked="checked"' : '' ?>
47
- <input <?php echo $_radioProperty ?> value="<?php echo $_code ?>" id="s_method_<?php echo $_code ?>" <?php echo $_checked ?>/>
48
- <label class="normal" for="s_method_<?php echo $_code ?>">
49
- <?php echo $this->escapeHtml($_rate->getMethodTitle() ? $_rate->getMethodTitle() : $_rate->getMethodDescription()) ?> -
50
- <strong>
51
- <?php if (!$_rate->getRequestContainsExactHour() || !$_rate->getSpeedyFixedHourEnabled()): ?>
52
-
53
- <?php $_excl = $this->getShippingPrice($_rate->getPrice(), $this->helper('tax')->displayShippingPriceIncludingTax()); ?>
54
- <?php $_incl = $this->getShippingPrice($_rate->getPrice(), true); ?>
55
-
56
- <?php else: ?>
57
- <?php if (!$this->_isPriceFixed && !$_rate->getIsFree()): ?>
58
- <?php $_excl = $this->getShippingPrice($_rate->getPrice() - $_rate->getSpeedyAmountFixedHourWithoutTax(), $this->helper('tax')->displayShippingPriceIncludingTax()); ?>
59
- <?php $_incl = $this->getShippingPrice($_rate->getPrice(), true); ?>
60
- <?php else : ?>
61
- <?php $_excl = $this->getShippingPrice($_rate->getPrice(), $this->helper('tax')->displayShippingPriceIncludingTax()); ?>
62
- <?php $_incl = $this->getShippingPrice($_rate->getPrice(), true); ?>
63
- <?php endif; ?>
64
- <?php endif; ?>
65
-
66
-
67
- <?php echo $_excl; ?>
68
- <?php if ($this->helper('tax')->displayShippingBothPrices() && $_incl != $_excl): ?>
69
- (<?php echo $this->__('Incl. Tax'); ?> <?php echo $_incl; ?>)
70
- <?php endif; ?>
71
- </strong>
72
- </label>
73
-
74
-
75
- <?php if($_rate->getIsFree()): ?>
76
- <input type="hidden" class="speedy_free_shipping" name="speedy_is_free_<?php echo $_rate->getCode() ?>" id="speedy_is_free_<?php echo $_rate->getCode() ?>" />
77
- <?php endif; ?>
78
-
79
- <?php if ($_rate->getSpeedyFixedHourEnabled()): ?>
80
-
81
- <?php if ($this->_selectedMethod == $_rate->getCode()): ?>
82
- <div class="speedy_method_options">
83
-
84
-
85
- <!--<input type="checkbox" name="speedy_exact_hour_<?php echo $_rate->getCode() ?>" checked="checked" class="speedy_exacthour_allowed "id="" />-->
86
-
87
-
88
- <input type="hidden" name="speedy_exact_hour_amount_withtax_<?php echo $_rate->getCode() ?>" value="<?php echo $_rate->getSpeedyAmountFixedHourWithTax() ?>" class="speedy_exacthour_allowed "id="" />
89
- <input type="hidden" name="speedy_exact_hour_amount_withouttax_<?php echo $_rate->getCode() ?>" value="<?php echo $_rate->getSpeedyAmountFixedHourWithoutTax() ?>" class="speedy_exacthour_withouttax"id="" />
90
-
91
- <?php else: ?>
92
- <div class="speedy_method_options">
93
- <input type="hidden" name="speedy_exact_hour_amount_withtax_<?php echo $_rate->getCode() ?>" value="<?php echo $_rate->getSpeedyAmountFixedHourWithTax() ?>" class="speedy_exacthour_allowed "id="" />
94
- <input type="hidden" name="speedy_exact_hour_amount_withouttax_<?php echo $_rate->getCode() ?>" value="<?php echo $_rate->getSpeedyAmountFixedHourWithoutTax() ?>" class="speedy_exacthour_withouttax"id="" />
95
- <?php endif; ?>
96
- <?php elseif ($_rate->getSpeedyFixedHourRequired()): ?>
97
- <span class="speedy_exacthour_required"></span>
98
- </div>
99
- <?php endif; ?>
100
-
101
- <?php endif ?>
102
- </li>
103
-
104
- <?php endforeach; ?>
105
- </ul>
106
- </dd>
107
- <?php
108
- $carrier = Mage::getModel('shipping/config')->getCarrierInstance($code);
109
- if ($carrier->getFormName()) {
110
-
111
- $block = $this->getLayout()->createBlock($carrier->getFormName());
112
- $block->setMethodCode($code);
113
- $block->setRate($_rate);
114
- $block->setMethodInstance($carrier);
115
- $blockOutput = $block->toHtml();
116
- echo $blockOutput;
117
- }
118
- ?>
119
- <?php endforeach; ?>
120
- </dl>
121
- </div>
122
- <?php if ($_rate = $this->getActiveMethodRate()): ?>
123
- <div id="order-shipping-method-info">
124
- <strong><?php echo $this->escapeHtml($this->getCarrierName($_rate->getCarrier())) ?></strong><br/>
125
- <?php echo $this->escapeHtml($_rate->getMethodTitle() ? $_rate->getMethodTitle() : $_rate->getMethodDescription()) ?> -
126
- <strong>
127
- <?php if (!$_rate->getRequestContainsExactHour() || !$_rate->getSpeedyFixedHourEnabled()): ?>
128
-
129
- <?php $_excl = $this->getShippingPrice($_rate->getPrice(), $this->helper('tax')->displayShippingPriceIncludingTax()); ?>
130
- <?php $_incl = $this->getShippingPrice($_rate->getPrice(), true); ?>
131
-
132
- <?php else: ?>
133
-
134
- <?php $_excl = $this->getShippingPrice($_rate->getPrice() - $_rate->getFixedTimeAmount(), $this->helper('tax')->displayShippingPriceIncludingTax()); ?>
135
- <?php $_incl = $this->getShippingPrice($_rate->getPrice(), true); ?>
136
-
137
- <?php endif; ?>
138
- <?php echo $_excl; ?>
139
- <?php if ($this->helper('tax')->displayShippingBothPrices() && $_incl != $_excl): ?>
140
- (<?php echo $this->__('Incl. Tax'); ?> <?php echo $_incl; ?>)
141
- <?php endif; ?>
142
- </strong>
143
- <!--input type="text" class="input-text" style="width:70px"/-->
144
- <br/>
145
- <a href="#" onclick="$('order-shipping-method-info').hide();
146
- $('order-shipping-method-choose').show();
147
- return false">
148
- <?php echo Mage::helper('sales')->__('Click to change shipping method') ?>
149
- </a>
150
- </div>
151
- <?php else: ?>
152
- <script type="text/javascript">$('order-shipping-method-choose').show();</script>
153
- <?php endif; ?>
154
- <?php elseif ($this->getIsRateRequest()): ?>
155
- <strong><?php echo Mage::helper('sales')->__('Sorry, no quotes are available for this order at this time.') ?></strong>
156
- <?php else: ?>
157
- <div id="order-shipping-method-summary">
158
- <a href="#" onclick="order.loadShippingRates();
159
- return false">
160
- <?php echo Mage::helper('sales')->__('Get shipping methods and rates') ?>
161
- </a>
162
- <input type="hidden" name="order[has_shipping]" value="" class="required-entry" />
163
- </div>
164
-
165
- <?php endif; ?>
166
- <div style="display:none;" id="shipping-method-overlay" class="overlay"><span><?php echo $this->__('Shipping method selection is not applicable') ?></span></div>
167
- <script type="text/javascript">
168
- order.overlay('shipping-method-overlay', <?php if ($this->getQuote()->isVirtual()): ?>false<?php else: ?>true<?php endif; ?>);
169
- order.overlay('address-shipping-overlay', <?php if ($this->getQuote()->isVirtual()): ?>false<?php else: ?>true<?php endif; ?>);
170
-
171
- $j('document').ready(function() {
172
-
173
-
174
- var currentMethod = $j('#order-shipping-method-choose input:radio:checked');
175
-
176
- setActiveRadioButton(currentMethod);
177
-
178
-
179
- function setActiveRadioButton(button) {
180
-
181
- var isExactHourAllowed = $j(button).nextAll('div.speedy_method_options').find('input:hidden.speedy_exacthour_allowed').length
182
- var isFreeMethod = $j(button).nextAll('input:hidden');
183
- if ($j(button).is(':checked') && isExactHourAllowed) {
184
- $j('input#speedy_exact_hour_enable').removeAttr('disabled')
185
- var finalSelector = $j(button).nextAll('div.speedy_method_options');
186
- var priceWithTax = $j(finalSelector).find('input:hidden.speedy_exacthour_allowed').val()
187
- var priceWithoutTax = $j(finalSelector).find('input:hidden.speedy_exacthour_withouttax').val()
188
- var price = '0.00';
189
- if (!isFreeMethod) {
190
-
191
- if (includeTax) {
192
- price = priceWithTax;
193
- }
194
- else if (excludeTax) {
195
- price = priceWithoutTax;
196
- }
197
- else if (showBoth) {
198
- price = priceWithoutTax + '/' + priceWithTax;
199
- }
200
- }
201
- price += ' лв.';
202
-
203
- $j('p#fixed_price_view').show().text("<?php echo $this->__("fixed hour extra charge") ?>" + price)
204
-
205
- } else {
206
-
207
- $j('#speedy_admin_form input#speedy_exact_hour_enable').attr('disabled', 'disabled').removeAttr('checked');
208
- $j('#speedy_admin_form input:text').attr('disabled', 'disabled').val('')
209
- $j('p#fixed_price_view').text("<?php echo $this->__("fixed hour extra charge") ?>");
210
-
211
- }
212
-
213
- }
214
-
215
-
216
- var currentMethodOptions = $j("input[type='radio'][id*='speedyshippingmodule']:checked").nextAll('div.speedy_method_options').find('input:hidden.speedy_exacthour_allowed').length;
217
-
218
- if (currentMethodOptions) {
219
- $j('#speedy_admin_form').show();
220
- }
221
-
222
-
223
- $j('#order-shipping-method-choose input:radio').change(function(evt) {
224
-
225
-
226
- var speedyMethod = $j("input[type='radio'][id*='speedyshippingmodule']").is(':checked');
227
-
228
- if (speedyMethod) {
229
-
230
-
231
- var target = $j(this).attr('id');
232
-
233
-
234
- if ($j('#' + target).nextAll('div.speedy_method_options').find('input:hidden.speedy_exacthour_allowed').length) {
235
-
236
- if (currentMethodOptions) {
237
-
238
- //$j(currentMethodOptions).nextAll('div.speedy_method_options').find('input:checkbox.speedy_exacthour_allowed').removeAttr('checked');
239
-
240
- $j('#speedy_admin_form').show();
241
- //$j(currentMethodOptions).nextAll('div.speedy_method_options').hide();
242
- }
243
-
244
- currentMethodOptions = '#' + target;
245
- $j('div#speedy_admin_form').show();
246
- $j(currentMethodOptions).nextAll('div.speedy_method_options').show();
247
-
248
- } else if ($j('#' + target).find('span.speedy_exacthour_required').length) {
249
-
250
- } else {
251
-
252
- //order.setShippingMethod(this.value)
253
-
254
- }
255
-
256
- var baseForm = 'div#order-shipping-method-choose';
257
-
258
- var quarter = $j(baseForm + ' #quarter_box').val();
259
- var quarter_id = $j(baseForm + ' #quarter_id').val();
260
- var street = $j(baseForm + ' #speedy_streets').val();
261
- var street_id = $j(baseForm + ' #speedy_street_id').val();
262
- var number = $j(baseForm + ' #speedy_number').val();
263
- var blockNo = $j(baseForm + ' #speedy_block_no').val();
264
- var note = $j(baseForm + ' #address_note').val();
265
-
266
- var isValid = 0;
267
-
268
- if (quarter && quarter_id) {
269
- if ((street && street_id && number) || blockNo) {
270
- isValid = true;
271
- }
272
-
273
- } else if ((street && street_id)) {
274
- if (number || blockNo) {
275
- isValid = true;
276
- }
277
-
278
- } else if ($j.trim(note)) {
279
- isValid = true;
280
-
281
- }
282
-
283
- if (isValid) {
284
- order.setShippingMethod(this.value)
285
- } else {
286
- $j('div#speedyError').show();
287
- }
288
-
289
- } else {
290
-
291
- order.setShippingMethod($j(this).val())
292
- }
293
- })
294
-
295
-
296
-
297
- })
298
-
299
- </script>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/design/adminhtml/default/default/template/speedy_speedyshipping/sales/order/create/totals.phtml~ DELETED
@@ -1,40 +0,0 @@
1
-
2
- <table cellspacing="0" cellpadding="8" width="100%">
3
- <tbody>
4
- <?php echo $this->renderTotals(); ?>
5
- <?php echo $this->renderTotals('footer'); ?>
6
- </tbody>
7
- </table>
8
- <div class="divider"></div>
9
- <div class="order-totals-bottom">
10
- <p>
11
- <label for="notify_customer" class="normal"><?php echo Mage::helper('sales')->__('Append Comments') ?></label>
12
- <input type="checkbox" id="notify_customer" name="order[comment][customer_note_notify]" value="1" <?php if($this->getNoteNotify()): ?>checked="true"<?php endif; ?>/>
13
- </p>
14
- <?php if ($this->canSendNewOrderConfirmationEmail()): ?>
15
- <p>
16
- <label for="send_confirmation" class="normal"><?php echo Mage::helper('sales')->__('Email Order Confirmation') ?></label>
17
- <input type="checkbox" id="send_confirmation" name="order[send_confirmation]" value="1" checked="checked"/>
18
- </p>
19
- <?php endif; ?>
20
- <p><?php echo $this->getButtonHtml(Mage::helper('sales')->__('Submit Order'),'','save'); ?></p>
21
- </div>
22
-
23
- <script type="text/javascript">
24
- //<![CDATA[
25
- var sendEmailCheckbox = $('send_confirmation');
26
- if (sendEmailCheckbox) {
27
- Event.observe(sendEmailCheckbox, 'change', notifyCustomerUpdate);
28
- notifyCustomerUpdate();
29
- }
30
-
31
- function notifyCustomerUpdate() {
32
- var sendEmailCheckbox = $('send_confirmation');
33
- var notifyCustomerCheckbox = $('notify_customer');
34
- if (!sendEmailCheckbox || !notifyCustomerCheckbox)
35
- return;
36
- notifyCustomerCheckbox.disabled = !sendEmailCheckbox.checked;
37
- }
38
- //]]>
39
-
40
- </script>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/design/frontend/base/default/template/speedy_speedyshipping/checkout/onepage/billing.phtml CHANGED
@@ -58,6 +58,7 @@
58
  <input type="text" title="<?php echo $this->__('City') ?>" name="billing[city]" value="<?php echo $this->escapeHtml($this->getAddress()->getCity()) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('city') ?>" id="billing:city" />
59
  </div>
60
  </div>
 
61
  <li class="fields">
62
  <label for=""><?php echo $this->__("Choose Speedy office") ?></label>
63
  <div class="field">
@@ -68,12 +69,17 @@
68
  <?php endif; ?>
69
  </div>
70
  </li>
 
71
  <input type="hidden" name="billing[speedy_site_id]" id="billing:speedy_site_id" value="<?php echo $this->escapeHtml($this->getAddress()->getSpeedySiteId()) ?>" />
72
- <?php if ($this->getAddress()->getSpeedyOfficeId()): ?>
 
 
 
73
  <div id="billing:speedy_office_address">
74
  <?php else: ?>
75
  <div id="billing:speedy_office_address" style="display: none">
76
  <?php endif; ?>
 
77
  <li class="wide" id="billing:speedy_office_textbox">
78
  <div class="field">
79
  <label for=""></label>
@@ -91,12 +97,12 @@
91
  </div>
92
  </li>
93
 
 
94
 
95
-
96
-
97
  </div>
98
-
99
-
100
  <?php if ($this->getAddress()->getSpeedyOfficeId()): ?>
101
 
102
  <div id="billing:speedy_normal_address" style="display: none">
@@ -104,6 +110,7 @@
104
  <div id="billing:speedy_normal_address">
105
 
106
  <?php endif; ?>
 
107
  <li class="wide">
108
  <div class="field">
109
 
@@ -172,7 +179,7 @@
172
  </div>
173
  </div>
174
  </li>
175
-
176
  </div>
177
  <li class="fields">
178
  <div class="field">
@@ -294,7 +301,8 @@
294
  </span>
295
  </div>
296
 
297
-
 
298
 
299
  </form>
300
  <script type="text/javascript">
58
  <input type="text" title="<?php echo $this->__('City') ?>" name="billing[city]" value="<?php echo $this->escapeHtml($this->getAddress()->getCity()) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('city') ?>" id="billing:city" />
59
  </div>
60
  </div>
61
+ </li>
62
  <li class="fields">
63
  <label for=""><?php echo $this->__("Choose Speedy office") ?></label>
64
  <div class="field">
69
  <?php endif; ?>
70
  </div>
71
  </li>
72
+ <li>
73
  <input type="hidden" name="billing[speedy_site_id]" id="billing:speedy_site_id" value="<?php echo $this->escapeHtml($this->getAddress()->getSpeedySiteId()) ?>" />
74
+ </li>
75
+ <li>
76
+
77
+ <?php if ($this->getAddress()->getSpeedyOfficeId()): ?>
78
  <div id="billing:speedy_office_address">
79
  <?php else: ?>
80
  <div id="billing:speedy_office_address" style="display: none">
81
  <?php endif; ?>
82
+ <ul>
83
  <li class="wide" id="billing:speedy_office_textbox">
84
  <div class="field">
85
  <label for=""></label>
97
  </div>
98
  </li>
99
 
100
+ </ul>
101
 
102
+
 
103
  </div>
104
+ </li>
105
+ <li>
106
  <?php if ($this->getAddress()->getSpeedyOfficeId()): ?>
107
 
108
  <div id="billing:speedy_normal_address" style="display: none">
110
  <div id="billing:speedy_normal_address">
111
 
112
  <?php endif; ?>
113
+ <ul>
114
  <li class="wide">
115
  <div class="field">
116
 
179
  </div>
180
  </div>
181
  </li>
182
+ </ul>
183
  </div>
184
  <li class="fields">
185
  <div class="field">
301
  </span>
302
  </div>
303
 
304
+ </ul>
305
+
306
 
307
  </form>
308
  <script type="text/javascript">
app/design/frontend/base/default/template/speedy_speedyshipping/checkout/onepage/payment_method/paymentInfo.phtml CHANGED
@@ -2,7 +2,7 @@
2
 
3
  <?php $isFixed = Mage::getStoreConfig('carriers/speedyshippingmodule/fixed_pricing_enable'); ?>
4
  <?php $output = null; ?>
5
- <?php if ($this->_codAmount && !$isFixed && !$this->_isFreeMethod){
6
 
7
 
8
  $output .='<p>'.$this->__('Speedy Payment method tax');
2
 
3
  <?php $isFixed = Mage::getStoreConfig('carriers/speedyshippingmodule/fixed_pricing_enable'); ?>
4
  <?php $output = null; ?>
5
+ <?php if ($this->_codAmount && ($isFixed != 2) && !$this->_isFreeMethod){
6
 
7
 
8
  $output .='<p>'.$this->__('Speedy Payment method tax');
app/design/frontend/base/default/template/speedy_speedyshipping/checkout/onepage/shipping.phtml CHANGED
@@ -22,7 +22,7 @@
22
  <input type="text" id="shipping:company" name="shipping[company]" value="<?php echo $this->escapeHtml($this->getAddress()->getCompany()) ?>" title="<?php echo $this->__('Company') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('company') ?>" onchange="shipping.setSameAsBilling(false);" />
23
  </div>
24
  </div>
25
- </li>
26
  <?php if (!$this->isCustomerLoggedIn()): ?>
27
  <div class="field">
28
  <label for="billing:email" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
@@ -68,12 +68,13 @@
68
  <?php endif; ?>
69
  </div>
70
  </li>
71
-
72
  <?php if ($this->getAddress()->getSpeedyOfficeId()): ?>
73
  <div id="shipping:speedy_office_address">
74
  <?php else: ?>
75
  <div id="shipping:speedy_office_address" style="display: none">
76
  <?php endif; ?>
 
77
  <li class="wide" id="shipping:speedy_office_textbox">
78
  <div class="field">
79
  <label for=""></label>
@@ -93,10 +94,10 @@
93
 
94
 
95
 
96
-
97
  </div>
98
 
99
-
100
  <?php if ($this->getAddress()->getSpeedyOfficeId()): ?>
101
 
102
  <div id="shipping:speedy_normal_address" style="display: none">
@@ -104,7 +105,7 @@
104
  <div id="shipping:speedy_normal_address">
105
 
106
  <?php endif; ?>
107
- </li>
108
  <li class="wide">
109
  <div class="field">
110
 
@@ -172,7 +173,7 @@
172
  </div>
173
  </div>
174
  </li>
175
-
176
  </div>
177
  <?php if ($this->helper('customer/address')->isVatAttributeVisible()) : ?>
178
  <li class="wide">
@@ -233,13 +234,13 @@
233
  <?php else: ?>
234
  <li class="no-display"><input type="hidden" name="shipping[save_in_address_book]" value="1" /></li>
235
  <?php endif; ?>
236
- </ul>
237
  </fieldset>
238
  </li>
239
  <li class="control" id="sameBillingBox">
240
  <input type="checkbox" name="shipping[same_as_billing]" id="shipping:same_as_billing" value="1"<?php if ($this->getAddress()->getSameAsBilling()): ?> checked="checked"<?php endif; ?> title="<?php echo $this->__('Use Billing Address') ?>" onclick="shipping.setSameAsBilling(this.checked)" class="checkbox" /><label for="shipping:same_as_billing"><?php echo $this->__('Use Billing Address') ?></label>
241
  </li>
242
- </ul>
243
  <div class="buttons-set" id="shipping-buttons-container">
244
  <p class="required"><?php echo $this->__('* Required Fields') ?></p>
245
  <p class="back-link"><a href="#" onclick="checkout.back();
@@ -249,6 +250,8 @@
249
  <img src="<?php echo $this->getSkinUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo $this->__('Loading next step...') ?>" title="<?php echo $this->__('Loading next step...') ?>" class="v-middle" /> <?php echo $this->__('Loading next step...') ?>
250
  </span>
251
  </div>
 
 
252
  </form>
253
  <script type="text/javascript">
254
  //<![CDATA[
22
  <input type="text" id="shipping:company" name="shipping[company]" value="<?php echo $this->escapeHtml($this->getAddress()->getCompany()) ?>" title="<?php echo $this->__('Company') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('company') ?>" onchange="shipping.setSameAsBilling(false);" />
23
  </div>
24
  </div>
25
+
26
  <?php if (!$this->isCustomerLoggedIn()): ?>
27
  <div class="field">
28
  <label for="billing:email" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
68
  <?php endif; ?>
69
  </div>
70
  </li>
71
+ <li>
72
  <?php if ($this->getAddress()->getSpeedyOfficeId()): ?>
73
  <div id="shipping:speedy_office_address">
74
  <?php else: ?>
75
  <div id="shipping:speedy_office_address" style="display: none">
76
  <?php endif; ?>
77
+ <ul>
78
  <li class="wide" id="shipping:speedy_office_textbox">
79
  <div class="field">
80
  <label for=""></label>
94
 
95
 
96
 
97
+ </ul>
98
  </div>
99
 
100
+ <li>
101
  <?php if ($this->getAddress()->getSpeedyOfficeId()): ?>
102
 
103
  <div id="shipping:speedy_normal_address" style="display: none">
105
  <div id="shipping:speedy_normal_address">
106
 
107
  <?php endif; ?>
108
+ <ul>
109
  <li class="wide">
110
  <div class="field">
111
 
173
  </div>
174
  </div>
175
  </li>
176
+ <ul>
177
  </div>
178
  <?php if ($this->helper('customer/address')->isVatAttributeVisible()) : ?>
179
  <li class="wide">
234
  <?php else: ?>
235
  <li class="no-display"><input type="hidden" name="shipping[save_in_address_book]" value="1" /></li>
236
  <?php endif; ?>
237
+
238
  </fieldset>
239
  </li>
240
  <li class="control" id="sameBillingBox">
241
  <input type="checkbox" name="shipping[same_as_billing]" id="shipping:same_as_billing" value="1"<?php if ($this->getAddress()->getSameAsBilling()): ?> checked="checked"<?php endif; ?> title="<?php echo $this->__('Use Billing Address') ?>" onclick="shipping.setSameAsBilling(this.checked)" class="checkbox" /><label for="shipping:same_as_billing"><?php echo $this->__('Use Billing Address') ?></label>
242
  </li>
243
+ <li>
244
  <div class="buttons-set" id="shipping-buttons-container">
245
  <p class="required"><?php echo $this->__('* Required Fields') ?></p>
246
  <p class="back-link"><a href="#" onclick="checkout.back();
250
  <img src="<?php echo $this->getSkinUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo $this->__('Loading next step...') ?>" title="<?php echo $this->__('Loading next step...') ?>" class="v-middle" /> <?php echo $this->__('Loading next step...') ?>
251
  </span>
252
  </div>
253
+ </li>
254
+ </ul>
255
  </form>
256
  <script type="text/javascript">
257
  //<![CDATA[
app/design/frontend/base/default/template/speedy_speedyshipping/checkout/onepage/shipping_method/pickupform.phtml CHANGED
@@ -28,7 +28,7 @@ showBoth= null;
28
 
29
  <div style="width: 350px;position: relative">
30
  <label for="speed_exact_hour_enable"><?php echo $this->__("choose fixed hour") ?></label><br />
31
- <?php if(!$isFixedPrice): ?>
32
  <p id="fixed_price_view"><?php echo $this->__("fixed hour extra charge") ?></p>
33
  <?php endif; ?>
34
  <input type="checkbox" disabled="disabled" name="speed_exact_hour_enable" class="input-box" id="speedy_exact_hour_enable" />
@@ -76,16 +76,19 @@ showBoth= null;
76
  price += priceWithTax;
77
  }
78
  if (excludeTax) {
79
- price += '/' + priceWithoutTax;
80
  }
81
  if(showBoth){
82
- price += priceWithoutTax+'/'+priceWithTax;
83
  }
84
  }else{
85
  price = '0.00';
86
  }
 
 
 
87
  price += ' лв.';
88
-
89
  $j('p#fixed_price_view').show().text('<?php echo $this->__("fixed hour extra charge") ?> '+' ' + price)
90
 
91
  } else {
28
 
29
  <div style="width: 350px;position: relative">
30
  <label for="speed_exact_hour_enable"><?php echo $this->__("choose fixed hour") ?></label><br />
31
+ <?php if($isFixedPrice != 2): ?>
32
  <p id="fixed_price_view"><?php echo $this->__("fixed hour extra charge") ?></p>
33
  <?php endif; ?>
34
  <input type="checkbox" disabled="disabled" name="speed_exact_hour_enable" class="input-box" id="speedy_exact_hour_enable" />
76
  price += priceWithTax;
77
  }
78
  if (excludeTax) {
79
+ price += priceWithoutTax;
80
  }
81
  if(showBoth){
82
+ price += priceWithoutTax+' лв. (<?php echo $this->__("vat_included") ?> '+priceWithTax;
83
  }
84
  }else{
85
  price = '0.00';
86
  }
87
+ if(showBoth){
88
+ price += ' лв.'+')'
89
+ }else{
90
  price += ' лв.';
91
+ }
92
  $j('p#fixed_price_view').show().text('<?php echo $this->__("fixed hour extra charge") ?> '+' ' + price)
93
 
94
  } else {
app/design/frontend/base/default/template/speedy_speedyshipping/customer/address/edit.phtml CHANGED
@@ -82,12 +82,13 @@
82
  <?php endif; ?>
83
  </div>
84
  </li>
85
-
86
  <?php if ($this->getAddress()->getSpeedyOfficeId()): ?>
87
  <div id="speedy_office_address">
88
  <?php else: ?>
89
  <div id="speedy_office_address" style="display: none">
90
  <?php endif; ?>
 
91
  <li class="wide" id="speedy_office_textbox">
92
  <div class="field">
93
  <label for=""></label>
@@ -105,19 +106,21 @@
105
  </div>
106
  </li>
107
 
108
-
109
 
110
 
111
  </div>
 
112
 
113
-
114
  <?php if ($this->getAddress()->getSpeedyOfficeId()): ?>
115
 
116
  <div id="speedy_normal_address" style="display: none">
117
  <?php else: ?>
118
  <div id="speedy_normal_address">
119
-
120
  <?php endif; ?>
 
121
  <li class="wide">
122
  <div class="field">
123
 
@@ -195,7 +198,9 @@
195
  </div>
196
  </div>
197
  </li>
 
198
  </div>
 
199
  <div class="field" style="display: none">
200
  <label for="region_id" class="required"><em>*</em><?php echo $this->__('State/Province') ?></label>
201
  <div class="input-box">
82
  <?php endif; ?>
83
  </div>
84
  </li>
85
+ <li>
86
  <?php if ($this->getAddress()->getSpeedyOfficeId()): ?>
87
  <div id="speedy_office_address">
88
  <?php else: ?>
89
  <div id="speedy_office_address" style="display: none">
90
  <?php endif; ?>
91
+ <ul>
92
  <li class="wide" id="speedy_office_textbox">
93
  <div class="field">
94
  <label for=""></label>
106
  </div>
107
  </li>
108
 
109
+ </ul>
110
 
111
 
112
  </div>
113
+ </li>
114
 
115
+ <li>
116
  <?php if ($this->getAddress()->getSpeedyOfficeId()): ?>
117
 
118
  <div id="speedy_normal_address" style="display: none">
119
  <?php else: ?>
120
  <div id="speedy_normal_address">
121
+
122
  <?php endif; ?>
123
+ <ul>
124
  <li class="wide">
125
  <div class="field">
126
 
198
  </div>
199
  </div>
200
  </li>
201
+ </ul>
202
  </div>
203
+ </li>
204
  <div class="field" style="display: none">
205
  <label for="region_id" class="required"><em>*</em><?php echo $this->__('State/Province') ?></label>
206
  <div class="input-box">
app/etc/modules/Speedyshipping.xml CHANGED
@@ -3,7 +3,7 @@
3
  <Speedy_Speedyshipping>
4
  <active>true</active>
5
  <codePool>community</codePool>
6
- <version>1.0.6</version>
7
  </Speedy_Speedyshipping>
8
  </modules>
9
  </config>
3
  <Speedy_Speedyshipping>
4
  <active>true</active>
5
  <codePool>community</codePool>
6
+ <version>1.0.7</version>
7
  </Speedy_Speedyshipping>
8
  </modules>
9
  </config>
app/locale/bg_BG/speedyTranslate.csv CHANGED
@@ -67,4 +67,5 @@
67
  "No matching bill of lading","Няма асоциирана поръчка!"
68
  "An error occured, while trying to create PDF","Възникна грешка при печата на товарителница"
69
  "Are you sure, that you want to make a couriter request","Заявка за куриер"
70
- "The feature is not supported yet","Функционалността все още не се поддръжа."
 
67
  "No matching bill of lading","Няма асоциирана поръчка!"
68
  "An error occured, while trying to create PDF","Възникна грешка при печата на товарителница"
69
  "Are you sure, that you want to make a couriter request","Заявка за куриер"
70
+ "The feature is not supported yet","Функционалността все още не се поддръжа."
71
+ "vat_included","Вкл. данък"
lib/SpeedyEPS/ver01/ParamPicking.class.php~ DELETED
@@ -1,1000 +0,0 @@
1
- <?php
2
-
3
- require_once 'Size.class.php';
4
- require_once 'ParamClientData.class.php';
5
- require_once 'FixedDiscountCardId.class.php';
6
- require_once 'ParamParcelInfo.class.php';
7
-
8
- /**
9
- * Instances of this class are passed as a parameter of Speedy web service calls for calclualation and registration
10
- * @since 1.0
11
- */
12
- class ParamPicking {
13
-
14
- /**
15
- * BOL number
16
- * MANDATORY: Only for updateBillOfLading. Null otherwise
17
- * @var integer Signed 64-bit
18
- */
19
- private $_billOfLading;
20
-
21
- /**
22
- * The date for shipment pick-up (the "time" component is ignored). Default value is "today".
23
- * MANDATORY: NO
24
- * @var date
25
- */
26
- private $_takingDate;
27
-
28
- /**
29
- * Courier service type ID
30
- * MANDATORY: YES
31
- * @var integer Signed 64-bit
32
- */
33
- private $_serviceTypeId;
34
-
35
- /**
36
- * ID of an office "to be called"
37
- * MANDATORY: Only for "to be called" pickings
38
- * @var integer Signed 64-bit
39
- */
40
- private $_officeToBeCalledId;
41
-
42
- /**
43
- * Fixed time for delivery ("HHmm" format, i.e., the number "1315" means "13:15", "830" means "8:30" etc.)
44
- * MANDATORY: Depending on the courier service, this property could be required, allowed or banned
45
- * @var integer Signed 16-bit
46
- */
47
- private $_fixedTimeDelivery;
48
-
49
- /**
50
- * In some rare cases users might prefer the delivery to be deferred by a day or two.
51
- * This parameter allows users to specify by how many (working) days they would like to postpone the shipment delivery.
52
- * Max 2 days
53
- * MANDATORY: No
54
- * @var integer Signed 32-bit
55
- */
56
- private $_deferredDeliveryWorkDays;
57
-
58
- /**
59
- * Specifies if the shipment has a "request for return documents"
60
- * MANDATORY: YES
61
- * @var boolean
62
- */
63
- private $_backDocumentsRequest;
64
-
65
- /**
66
- * Specifies if the shipment has a "request for return receipt"
67
- * MANDATORY: YES
68
- * @var boolean
69
- */
70
- private $_backReceiptRequest;
71
-
72
- /**
73
- * Specifies if the sender intends to deliver the shipment to a Speedy office by him/herself instead of ordering a visit by courier
74
- * MANDATORY: YES
75
- * @var boolean
76
- */
77
- private $_willBringToOffice;
78
-
79
- /**
80
- * Specifies the specific Speedy office, where the sender intends to deliver the shipment by him/herself.
81
- * If willBringToOfficeId is provided, willBringToOffice flag is considered "true", regardless the value provided.
82
- * If willBringToOfficeId is not provied (0 or null) and willBringToOffice flag is "true",
83
- * willBringToOfficeId is automatically set with default value configured for caller user profile.
84
- * The default willBringToOfficeId value could be managed using profile configuration page in client's Speedy web site.
85
- * MANDATORY: NO
86
- * @since 1.3
87
- * @var integer Signed 64-bit
88
- */
89
- private $_willBringToOfficeId;
90
-
91
- /**
92
- * Shipment insurance value (if the shipment is insured).
93
- * The value is limited depending on user's permissions and Speedy's current policy
94
- * MANDATORY: NO
95
- * @var double Signed 64-bit
96
- */
97
- private $_amountInsuranceBase;
98
-
99
- /**
100
- * Cash-on-Delivery (COD) amount.
101
- * The value is limited depending on user's permissions and Speedy's current policy
102
- * MANDATORY: NO
103
- * @var double Signed 64-bit
104
- */
105
- private $_amountCodBase;
106
-
107
- /**
108
- * Specifies if the COD value is to be paid to a third party. Allowed only if the shipment has payerType = 2 (third party).
109
- * MANDATORY: NO
110
- * @var boolean
111
- */
112
- private $_payCodToThirdParty;
113
-
114
- /**
115
- * Return money-transfer request amount
116
- * The value is limited depending on user's permissions and Speedy's current policy
117
- * MANDATORY: NO
118
- * @var double Signed 64-bit
119
- */
120
- private $_retMoneyTransferReqAmount;
121
-
122
- /**
123
- * Parcels count. Maximum value is 999.
124
- * MANDATORY: YES
125
- * @var integer Signed 32-bit
126
- */
127
- private $_parcelsCount;
128
-
129
- /**
130
- * Size of shipment
131
- * MANDATORY: NO
132
- * @var Size
133
- */
134
- private $_size;
135
-
136
- /**
137
- * Declared weight (the greater of "volume" and "real" weight values).
138
- * Maximum value is 100.00
139
- * MANDATORY: YES
140
- * @var double Signed 64-bit
141
- */
142
- private $_weightDeclared;
143
-
144
- /**
145
- * Contents. Max text size - 50 symbols
146
- * MANDATORY: YES
147
- * @var string
148
- */
149
- private $_contents;
150
-
151
- /**
152
- * Packing
153
- * MANDATORY: YES
154
- * @var string
155
- */
156
- private $_packing;
157
-
158
- /**
159
- * Packing ID (number)
160
- * MANDATORY: NO
161
- * @var integer Signed 64-bit
162
- */
163
- private $_packId;
164
-
165
- /**
166
- * Specifies whether the shipment consists of documents
167
- * MANDATORY: YES
168
- * @var boolean
169
- */
170
- private $_documents;
171
-
172
- /**
173
- * Specifies whether the shipment is fragile - necessary when the price of insurance is being calculated
174
- * MANDATORY: YES
175
- * @var boolean
176
- */
177
- private $_fragile;
178
-
179
- /**
180
- * Specifies whether the shipment is palletized
181
- * MANDATORY: YES
182
- * @var boolean
183
- */
184
- private $_palletized;
185
-
186
- /**
187
- * Data for the sender
188
- * MANDATORY: YES
189
- * @var ParamClientData
190
- */
191
- private $_sender;
192
-
193
- /**
194
- * Data for the receiver
195
- * MANDATORY: YES
196
- * @var ParamClientData
197
- */
198
- private $_receiver;
199
-
200
- /**
201
- * Payer type (0=sender, 1=receiver or 2=third party)
202
- * MANDATORY: YES
203
- * @var integer Signed 32-bit
204
- */
205
- private $_payerType;
206
-
207
- /**
208
- * Payer ID.
209
- * MANDATORY: Must be set <=> payer is "third party".
210
- * @var integer Signed 64-bit
211
- */
212
- private $_payerRefId;
213
-
214
- /**
215
- * Insurance payer type (0=sender, 1=reciever or 2=third party)
216
- * MANDATORY: Must be set <=> shipment is insured (i.e. amountInsuranceBase > 0).
217
- * @var integer Signed 32-bit
218
- */
219
- private $_payerTypeInsurance;
220
-
221
- /**
222
- * Insurance payer ID
223
- * MANDATORY: Must be set <=> shipment has insurance (i.e. amountInsuranceBase > 0) and it is payed by a "third party".
224
- * @var integer Signed 64-bit
225
- */
226
- private $_payerRefInsuranceId;
227
-
228
- /**
229
- * Client's note
230
- * MANDATORY: NO
231
- * @var string
232
- */
233
- private $_noteClient;
234
-
235
- /**
236
- * Card/Coupon/Voucher number for fixed discount
237
- * MANDATORY: NO
238
- * @var FixedDiscountCardId
239
- */
240
- private $_discCalc;
241
-
242
- /**
243
- * ID of the client who is to receive the return receipt and/or the return documents.
244
- * If payer is "third party" then this client has to be payer's contract member.
245
- * Otherwise the client has to be sender's contract member.
246
- * MANDATORY: NO
247
- * @var integer Signed 64-bit
248
- */
249
- private $_retToClientId;
250
-
251
- /**
252
- * An optional reference code.
253
- * Maximum 30 symbols
254
- * MANDATORY: NO
255
- * @var string
256
- */
257
- private $_ref1;
258
-
259
- /**
260
- * An optional reference code.
261
- * Maximum 30 symbols
262
- * MANDATORY: NO
263
- * @var string
264
- */
265
- private $_ref2;
266
-
267
- /**
268
- * An optional value used to identify user's client software.
269
- * Please verify the allowed values with Speedy's IT Department.
270
- * MANDATORY: NO
271
- * @var integer Signed 64-bit
272
- */
273
- private $_clientSystemId;
274
-
275
- /**
276
- * Data for parcels with explicit/fixed IDs (from the second one onward)
277
- * The list has maximum lenght 998
278
- * MANDATORY: NO
279
- * @var array List of ParamParcelInfo
280
- */
281
- private $_parcels;
282
-
283
- /**
284
- * When parcelsCount > 1 and no explicit data has been set in the parcels property during the creation,
285
- * then parcels will be created automatically by default.
286
- * This parameter allows users to control this behaviour.
287
- * MANDATORY: NO
288
- * @var boolean
289
- */
290
- private $_skipAutomaticParcelsCreation;
291
-
292
- /**
293
- * Specifies if the service/system should allow parcels to be added to the shipment at a later stage.
294
- * MANDATORY: NO
295
- * @var boolean
296
- */
297
- private $_pendingParcelsDescription;
298
-
299
- /**
300
- * Specifies if the service/system should allow BOL's modification at a later stage.
301
- * MANDATORY: NO
302
- * @var boolean
303
- */
304
- private $_pendingShipmentDescription;
305
-
306
- /**
307
- * Set BOL number
308
- * @param integer $billOfLading Signed 64-bit
309
- */
310
- public function setBillOfLading($billOfLading) {
311
- $this->_billOfLading = $billOfLading;
312
- }
313
-
314
- /**
315
- * Get BOL number
316
- * @return integer Signed 64-bit
317
- */
318
- public function getBillOfLading() {
319
- return $this->_billOfLading;
320
- }
321
-
322
- /**
323
- * Set date for shipment pick-up (the "time" component is ignored).
324
- * @param date $takingDate
325
- */
326
- public function setTakingDate($takingDate) {
327
- $this->_takingDate = $takingDate;
328
- }
329
-
330
- /**
331
- * Get BOL number
332
- * @return date
333
- */
334
- public function getTakingDate() {
335
- return $this->_takingDate;
336
- }
337
-
338
- /**
339
- * Set courier service type ID
340
- * @param integer $serviceTypeId Signed 64-bit
341
- */
342
- public function setServiceTypeId($serviceTypeId) {
343
- $this->_serviceTypeId = $serviceTypeId;
344
- }
345
-
346
- /**
347
- * Get courier service type ID
348
- * @return integer Signed 64-bit
349
- */
350
- public function getServiceTypeId() {
351
- return $this->_serviceTypeId;
352
- }
353
-
354
- /**
355
- * Set ID of an office "to be called"
356
- * @param integer $officeToBeCalledId Signed 64-bit
357
- */
358
- public function setOfficeToBeCalledId($officeToBeCalledId) {
359
- $this->_officeToBeCalledId = $officeToBeCalledId;
360
- }
361
-
362
- /**
363
- * Get ID of an office "to be called"
364
- * @return integer Signed 64-bit
365
- */
366
- public function getOfficeToBeCalledId() {
367
- return $this->_officeToBeCalledId;
368
- }
369
-
370
- /**
371
- * Set fixed time for delivery ("HHmm" format, i.e., the number "1315" means "13:15", "830" means "8:30" etc.)
372
- * @param integer $fixedTimeDelivery Signed 16-bit
373
- */
374
- public function setFixedTimeDelivery($fixedTimeDelivery) {
375
- $this->_fixedTimeDelivery = $fixedTimeDelivery;
376
- }
377
-
378
- /**
379
- * Get fixed time for delivery
380
- * @return integer Signed 16-bit
381
- */
382
- public function getFixedTimeDelivery() {
383
- return $this->_fixedTimeDelivery;
384
- }
385
-
386
- /**
387
- * Set working days to postpone the shipment delivery. Allowe values are 1 or 2
388
- * @param integer $deferredDeliveryWorkDays Signed 32-bit
389
- */
390
- public function setDeferredDeliveryWorkDays($deferredDeliveryWorkDays) {
391
- $this->_deferredDeliveryWorkDays = $deferredDeliveryWorkDays;
392
- }
393
-
394
- /**
395
- * Get working days to postpone the shipment delivery
396
- * @return integer Signed 32-bit
397
- */
398
- public function getDeferredDeliveryWorkDays() {
399
- return $this->_deferredDeliveryWorkDays;
400
- }
401
-
402
- /**
403
- * Set "request for return documents" flag for shipment
404
- * @param boolean $backDocumentsRequest
405
- */
406
- public function setBackDocumentsRequest($backDocumentsRequest) {
407
- $this->_backDocumentsRequest = $backDocumentsRequest;
408
- }
409
-
410
- /**
411
- * Check "request for return documents" flag for shipment
412
- * @return boolean
413
- */
414
- public function isBackDocumentsRequest() {
415
- return $this->_backDocumentsRequest;
416
- }
417
-
418
- /**
419
- * Set "request for return receipt" flag for shipment
420
- * @param boolean $backReceiptRequest
421
- */
422
- public function setBackReceiptRequest($backReceiptRequest) {
423
- $this->_backReceiptRequest = $backReceiptRequest;
424
- }
425
-
426
- /**
427
- * Check "request for return receipt" flag for shipment
428
- * @return boolean
429
- */
430
- public function isBackReceiptRequest() {
431
- return $this->_backReceiptRequest;
432
- }
433
-
434
- /**
435
- * Set "bring to office" flag for shipment
436
- * @param boolean $willBringToOffice
437
- */
438
- public function setWillBringToOffice($willBringToOffice) {
439
- $this->_willBringToOffice = $willBringToOffice;
440
- }
441
-
442
- /**
443
- * Check "bring to office" flag for shipment
444
- * @return boolean
445
- */
446
- public function getWillBringToOffice() {
447
- return $this->_willBringToOffice;
448
- }
449
-
450
- /**
451
- * Set "bring to office" id
452
- * @since 1.3
453
- * @param Signed 64-bit $willBringToOfficeId
454
- */
455
- public function setWillBringToOfficeId($willBringToOfficeId) {
456
- $this->_willBringToOfficeId = $willBringToOfficeId;
457
- }
458
-
459
- /**
460
- * Get "bring to office" id
461
- * @since 1.3
462
- * @return Signed 64-bit
463
- */
464
- public function getWillBringToOfficeId() {
465
- return $this->_willBringToOfficeId;
466
- }
467
-
468
- /**
469
- * Set shipment insurance value (if the shipment is insured).
470
- * @param double $amountInsuranceBase Signed 64-bit
471
- */
472
- public function setAmountInsuranceBase($amountInsuranceBase) {
473
- $this->_amountInsuranceBase = $amountInsuranceBase;
474
- }
475
-
476
- /**
477
- * Get shipment insurance value
478
- * @return double Signed 64-bit
479
- */
480
- public function getAmountInsuranceBase() {
481
- return $this->_amountInsuranceBase;
482
- }
483
-
484
- /**
485
- * Set cash-on-Delivery (COD) amount.
486
- * @param double $amountCodBase Signed 64-bit
487
- */
488
- public function setAmountCodBase($amountCodBase) {
489
- $this->_amountCodBase = $amountCodBase;
490
- }
491
-
492
- /**
493
- * Get cash-on-Delivery (COD) amount.
494
- * @return double Signed 64-bit
495
- */
496
- public function getAmountCodBase() {
497
- return $this->_amountCodBase;
498
- }
499
-
500
- /**
501
- * Set flag for COD value to be paid to a third party. Allowed only if the shipment has payerType = 2 (third party).
502
- * @param boolean $payCodToThirdParty
503
- */
504
- public function setPayCodToThirdParty($payCodToThirdParty) {
505
- $this->_payCodToThirdParty = $payCodToThirdParty;
506
- }
507
-
508
- /**
509
- * Check flag for COD value to be paid to a third party
510
- * @return boolean
511
- */
512
- public function isPayCodToThirdParty() {
513
- return $this->_payCodToThirdParty;
514
- }
515
-
516
- /**
517
- * Set return money-transfer request amount
518
- * @param double $retMoneyTransferReqAmount Signed 64-bit
519
- */
520
- public function setRetMoneyTransferReqAmount($retMoneyTransferReqAmount) {
521
- $this->_retMoneyTransferReqAmount = $retMoneyTransferReqAmount;
522
- }
523
-
524
- /**
525
- * Get return money-transfer request amount
526
- * @return double Signed 64-bit
527
- */
528
- public function getRetMoneyTransferReqAmount() {
529
- return $this->_retMoneyTransferReqAmount;
530
- }
531
-
532
- /**
533
- * Set parcels count. Maximum value is 999
534
- * @param integer $parcelsCount Signed 32-bit
535
- */
536
- public function setParcelsCount($parcelsCount) {
537
- $this->_parcelsCount = $parcelsCount;
538
- }
539
-
540
- /**
541
- * Get parcels count
542
- * @return integer Signed 32-bit
543
- */
544
- public function getParcelsCount() {
545
- return $this->_parcelsCount;
546
- }
547
-
548
- /**
549
- * Set size of shipment
550
- * @param Size $size
551
- */
552
- public function setSize($size) {
553
- $this->_size = $size;
554
- }
555
-
556
- /**
557
- * Get size of shipment
558
- * @return Size
559
- */
560
- public function getSize() {
561
- return $this->_size;
562
- }
563
-
564
- /**
565
- * Set declared weight (the greater of "volume" and "real" weight values). Maximum value is 100.00
566
- * @param double $weightDeclared Signed 64-bit
567
- */
568
- public function setWeightDeclared($weightDeclared) {
569
- $this->_weightDeclared = $weightDeclared;
570
- }
571
-
572
- /**
573
- * Get declared weight
574
- * @return double Signed 64-bit
575
- */
576
- public function getWeightDeclared() {
577
- return $this->_weightDeclared;
578
- }
579
-
580
- /**
581
- * Set contents. Max text size - 50 symbols
582
- * @param string $contents
583
- */
584
- public function setContents($contents) {
585
- $this->_contents = $contents;
586
- }
587
-
588
- /**
589
- * Get contents.
590
- * @return string
591
- */
592
- public function getContents() {
593
- return $this->_contents;
594
- }
595
-
596
- /**
597
- * Set contents. Max text size - 50 symbols
598
- * @param string $packing
599
- */
600
- public function setPacking($packing) {
601
- $this->_packing = $packing;
602
- }
603
-
604
- /**
605
- * Get contents.
606
- * @return string
607
- */
608
- public function getPacking() {
609
- return $this->_packing;
610
- }
611
-
612
- /**
613
- * Set packing ID (number)
614
- * @param integer $packId Signed 64-bit
615
- */
616
- public function setPackId($packId) {
617
- $this->_packId = $packId;
618
- }
619
-
620
- /**
621
- * Get packing ID (number).
622
- * @return integer Signed 64-bit
623
- */
624
- public function getPackId() {
625
- return $this->_packId;
626
- }
627
-
628
- /**
629
- * Set flag whether shipment consists of documents
630
- * @param boolean $documents
631
- */
632
- public function setDocuments($documents) {
633
- $this->_documents = $documents;
634
- }
635
-
636
- /**
637
- * Check whether shipment consists if documents
638
- * @return boolean
639
- */
640
- public function isDocuments() {
641
- return $this->_documents;
642
- }
643
-
644
- /**
645
- * Set flag whether shipment is fragile - necessary when the price of insurance is being calculated
646
- * @param boolean $fragile
647
- */
648
- public function setFragile($fragile) {
649
- $this->_fragile = $fragile;
650
- }
651
-
652
- /**
653
- * Check whether shipment is fragile
654
- * @return boolean
655
- */
656
- public function isFragile() {
657
- return $this->_fragile;
658
- }
659
-
660
- /**
661
- * Set flag whether shipment is palletized
662
- * @param boolean $palletized
663
- */
664
- public function setPalletized($palletized) {
665
- $this->_palletized = $palletized;
666
- }
667
-
668
- /**
669
- * Check whether shipment is palletized
670
- * @return boolean
671
- */
672
- public function isPalletized() {
673
- return $this->_palletized;
674
- }
675
-
676
- /**
677
- * Set data for the sender
678
- * @param ParamClientData $sender
679
- */
680
- public function setSender($sender) {
681
- $this->_sender = $sender;
682
- }
683
-
684
- /**
685
- * Get data for the sender
686
- * @return ParamClientData
687
- */
688
- public function getSender() {
689
- return $this->_sender;
690
- }
691
-
692
- /**
693
- * Set data for the receiver
694
- * @param ParamClientData $receiver
695
- */
696
- public function setReceiver($receiver) {
697
- $this->_receiver = $receiver;
698
- }
699
-
700
- /**
701
- * Get data for the receiver
702
- * @return ParamClientData
703
- */
704
- public function getReceiver() {
705
- return $this->_receiver;
706
- }
707
-
708
- /**
709
- * Set payer type (0=sender, 1=receiver or 2=third party)
710
- * @param integer $payerType Signed 32-bit
711
- */
712
- public function setPayerType($payerType) {
713
- $this->_payerType = $payerType;
714
- }
715
-
716
- /**
717
- * Get payer type (0=sender, 1=receiver or 2=third party)
718
- * @return integer Signed 32-bit
719
- */
720
- public function getPayerType() {
721
- return $this->_payerType;
722
- }
723
-
724
- /**
725
- * Set payer ID
726
- * @param integer $payerRefId Signed 64-bit
727
- */
728
- public function setPayerRefId($payerRefId) {
729
- $this->_payerRefId = $payerRefId;
730
- }
731
-
732
- /**
733
- * Get payer ID
734
- * @return integer Signed 64-bit
735
- */
736
- public function getPayerRefId() {
737
- return $this->_payerRefId;
738
- }
739
-
740
- /**
741
- * Set insurance payer type (0=sender, 1=reciever or 2=third party)
742
- * @param integer $payerTypeInsurance Signed 32-bit
743
- */
744
- public function setPayerTypeInsurance($payerTypeInsurance) {
745
- $this->_payerTypeInsurance = $payerTypeInsurance;
746
- }
747
-
748
- /**
749
- * Get insurance payer type
750
- * @return integer Signed 32-bit
751
- */
752
- public function getPayerTypeInsurance() {
753
- return $this->_payerTypeInsurance;
754
- }
755
-
756
- /**
757
- * Set insurance payer ID
758
- * @param integer $payerRefInsuranceId Signed 64-bit
759
- */
760
- public function setPayerRefInsuranceId($payerRefInsuranceId) {
761
- $this->_payerRefInsuranceId = $payerRefInsuranceId;
762
- }
763
-
764
- /**
765
- * Get insurance payer ID
766
- * @return integer Signed 64-bit
767
- */
768
- public function getPayerRefInsuranceId() {
769
- return $this->_payerRefInsuranceId;
770
- }
771
-
772
- /**
773
- * Set client's note
774
- * @param string $noteClient
775
- */
776
- public function setNoteClient($noteClient) {
777
- $this->_noteClient = $noteClient;
778
- }
779
-
780
- /**
781
- * Get client's note
782
- * @return string
783
- */
784
- public function getNoteClient() {
785
- return $this->_noteClient;
786
- }
787
-
788
- /**
789
- * Set card/coupon/voucher number for fixed discount
790
- * @param FixedDiscountCardId $discCalc
791
- */
792
- public function setDiscCalc($discCalc) {
793
- $this->_discCalc = $discCalc;
794
- }
795
-
796
- /**
797
- * Get card/coupon/voucher number for fixed discount
798
- * @return FixedDiscountCardId
799
- */
800
- public function getDiscCalc() {
801
- return $this->_discCalc;
802
- }
803
-
804
- /**
805
- * Set ID of the client who is to receive the return receipt and/or the return documents.
806
- * If payer is "third party" then this client has to be payer's contract member.
807
- * Otherwise the client has to be sender's contract member.
808
- * @param integer $retToClientId Signed 64-bit
809
- */
810
- public function setRetToClientId($retToClientId) {
811
- $this->_retToClientId = $retToClientId;
812
- }
813
-
814
- /**
815
- * Get ID of the client who is to receive the return receipt and/or the return documents.
816
- * @return integer Signed 64-bit
817
- */
818
- public function getRetToClientId() {
819
- return $this->_retToClientId;
820
- }
821
-
822
- /**
823
- * Set optional reference code. Maximum 30 symbols.
824
- * @param string $ref1
825
- */
826
- public function setRef1($ref1) {
827
- $this->_ref1 = $ref1;
828
- }
829
-
830
- /**
831
- * Get optional reference code. Maximum 30 symbols.
832
- * @return string
833
- */
834
- public function getRef1() {
835
- return $this->_ref1;
836
- }
837
-
838
- /**
839
- * Set optional reference code 2. Maximum 30 symbols.
840
- * @param string $ref2
841
- */
842
- public function setRef2($ref2) {
843
- $this->_ref2 = $ref2;
844
- }
845
-
846
- /**
847
- * Get optional reference code 2. Maximum 30 symbols.
848
- * @return string
849
- */
850
- public function getRef2() {
851
- return $this->_ref2;
852
- }
853
-
854
- /**
855
- * Set optional value used to identify user's client software.
856
- * @param integer $clientSystemId Signed 64-bit
857
- */
858
- public function setClientSystemId($clientSystemId) {
859
- $this->_clientSystemId = $clientSystemId;
860
- }
861
-
862
- /**
863
- * Get optional value used to identify user's client software.
864
- * @return integer Signed 64-bit
865
- */
866
- public function getClientSystemId() {
867
- return $this->_clientSystemId;
868
- }
869
-
870
- /**
871
- * Set data for parcels with explicit/fixed IDs (from the second one onward)
872
- * @param array $parcels List of ParamParcelInfo
873
- */
874
- public function setParcels($parcels) {
875
- $this->_parcels = $parcels;
876
- }
877
-
878
- /**
879
- * Get data for parcels with explicit/fixed IDs (from the second one onward)
880
- * @return array List of ParamParcelInfo
881
- */
882
- public function getParcels() {
883
- return $this->_parcels;
884
- }
885
-
886
- /**
887
- * Set flag to set or not explicit data on processing parcels with sequence number > 1
888
- * @param boolean $skipAutomaticParcelsCreation
889
- */
890
- public function setSkipAutomaticParcelsCreation($skipAutomaticParcelsCreation) {
891
- $this->_skipAutomaticParcelsCreation = $skipAutomaticParcelsCreation;
892
- }
893
-
894
- /**
895
- * Check flag to set or not explicit data on processing parcels with sequence number > 1
896
- * @return boolean
897
- */
898
- public function isSkipAutomaticParcelsCreation() {
899
- return $this->_skipAutomaticParcelsCreation;
900
- }
901
-
902
- /**
903
- * Set flag service/system to allow parcels to be added to the shipment at a later stage
904
- * @param boolean $pendingParcelsDescription
905
- */
906
- public function setPendingParcelsDescription($pendingParcelsDescription) {
907
- $this->_pendingParcelsDescription = $pendingParcelsDescription;
908
- }
909
-
910
- /**
911
- * Check whether service/system to allow parcels to be added to the shipment at a later stage
912
- * @return boolean
913
- */
914
- public function isPendingParcelsDescription() {
915
- return $this->_pendingParcelsDescription;
916
- }
917
-
918
- /**
919
- * Set flag the service/system to allow BOL's modification at a later stage.
920
- * @param boolean $pendingShipmentDescription
921
- */
922
- public function setPendingShipmentDescription($pendingShipmentDescription) {
923
- $this->_pendingShipmentDescription = $pendingShipmentDescription;
924
- }
925
-
926
- /**
927
- * Check whether the service/system should allow BOL's modification at a later stage.
928
- * @return boolean
929
- */
930
- public function isPendingShipmentDescription() {
931
- return $this->_pendingShipmentDescription;
932
- }
933
-
934
- /**
935
- * Return standard class from this class
936
- * @return stdClass
937
- */
938
- public function toStdClass() {
939
- $stdClass = new stdClass();
940
- $stdClass->billOfLading = $this->_billOfLading;
941
- $stdClass->takingDate = $this->_takingDate;
942
- $stdClass->serviceTypeId = $this->_serviceTypeId;
943
- $stdClass->officeToBeCalledId = $this->_officeToBeCalledId;
944
- $stdClass->fixedTimeDelivery = $this->_fixedTimeDelivery;
945
- $stdClass->deferredDeliveryWorkDays = $this->_deferredDeliveryWorkDays;
946
- $stdClass->backDocumentsRequest = $this->_backDocumentsRequest;
947
- $stdClass->backReceiptRequest = $this->_backReceiptRequest;
948
- $stdClass->willBringToOffice = $this->_willBringToOffice;
949
- $stdClass->willBringToOffice = $this->_willBringToOfficeId;
950
- $stdClass->amountInsuranceBase = $this->_amountInsuranceBase;
951
- $stdClass->amountCodBase = $this->_amountCodBase;
952
- $stdClass->payCodToThirdParty = $this->_payCodToThirdParty;
953
- $stdClass->retMoneyTransferReqAmount = $this->_retMoneyTransferReqAmount;
954
- $stdClass->parcelsCount = $this->_parcelsCount;
955
- if (isset($this->_size)) {
956
- $stdClass->size = $this->_size->toStdClass();
957
- }
958
- $stdClass->weightDeclared = $this->_weightDeclared;
959
- $stdClass->contents = $this->_contents;
960
- $stdClass->packing = $this->_packing;
961
- $stdClass->packId = $this->_packId;
962
- $stdClass->documents = $this->_documents;
963
- $stdClass->fragile = $this->_fragile;
964
- $stdClass->palletized = $this->_palletized;
965
- if (isset($this->_sender)) {
966
- $stdClass->sender = $this->_sender->toStdClass();
967
- }
968
- if (isset($this->_receiver)) {
969
- $stdClass->receiver = $this->_receiver->toStdClass();
970
- }
971
- $stdClass->payerType = $this->_payerType;
972
- $stdClass->payerRefId = $this->_payerRefId;
973
- $stdClass->payerTypeInsurance = $this->_payerTypeInsurance;
974
- $stdClass->payerRefInsuranceId = $this->_payerRefInsuranceId;
975
- $stdClass->noteClient = $this->_noteClient;
976
- if (isset($this->_discCalc)) {
977
- $stdClass->discCalc = $this->_discCalc->toStdClass();
978
- }
979
- $stdClass->retToClientId = $this->_retToClientId;
980
- $stdClass->ref1 = $this->_ref1;
981
- $stdClass->ref2 = $this->_ref2;
982
- $stdClass->clientSystemId = $this->_clientSystemId;
983
- $arrStdClassParamParcelInfo = array();
984
- if (isset($this->_parcels)) {
985
- if (is_array($this->_parcels)) {
986
- for($i = 0; $i < count($this->_parcels); $i++) {
987
- $arrStdClassParamParcelInfo[$i] = $this->_parcels[$i]->toStdClass();
988
- }
989
- } else {
990
- $arrStdClassParamParcelInfo[0] = $this->_parcels->toStdClass();
991
- }
992
- }
993
- $stdClass->parcels = $arrStdClassParamParcelInfo;
994
- $stdClass->skipAutomaticParcelsCreation = $this->_skipAutomaticParcelsCreation;
995
- $stdClass->pendingParcelsDescription = $this->_pendingParcelsDescription;
996
- $stdClass->pendingShipmentDescription = $this->_pendingShipmentDescription;
997
- return $stdClass;
998
- }
999
- }
1000
- ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
package.xml CHANGED
@@ -1,18 +1,18 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Speedy_Shipping</name>
4
- <version>1.0.6</version>
5
  <stability>stable</stability>
6
  <license>Open Software License (OSL 3.0)</license>
7
  <channel>community</channel>
8
  <extends/>
9
- <summary>Initial release</summary>
10
- <description>Initial release</description>
11
- <notes>Initial release</notes>
12
  <authors><author><name>Speedy</name><user>evgeni</user><email>evgeni@omg-m.com</email></author></authors>
13
- <date>2013-11-27</date>
14
- <time>10:05:46</time>
15
- <contents><target name="magecommunity"><dir name="Speedy"><dir name="Speedyshipping"><dir name="Block"><dir name="Adminhtml"><file name="Billoflading.php" hash="5ff4f88bece3607c615152f78c448520"/><dir name="Requestcourier"><file name="Grid.php" hash="1cf35ad632bbfd748acc377294ceaa64"/><dir name="Renderer"><file name="Cancelbutton.php" hash="895663d2b4a3ed8ef83a2f47cc1260c3"/><file name="Created.php" hash="e4319a0fd1c80d0e9164bf678f8a509f"/><file name="Requestbutton.php" hash="66fe360ec85a73a27200e7f83ab9b9a7"/><file name="Viewbol.php" hash="f5a61d534ece18b78907207411cae952"/><file name="Vieworder.php" hash="fb6c0ac4134d26a705f2c7bdc658f035"/></dir><file name="Requestcontainer.php" hash="bf03f9fdef44ac754ebfc89b136a1580"/></dir><dir name="Sales"><dir name="Order"><dir name="Create"><dir name="Billing"><file name="Address.php" hash="575ebbda49b25e95f37bca49cfba623d"/></dir><dir name="Shipping"><file name="Address.php" hash="14c1dc61fcfa00a7f685e2c025f31901"/><file name="Form.php" hash="90112a2a3ed59b021d8fcd347e7b5292"/></dir><dir name="Speedy"><file name="Form.php" hash="5d33815cc6bf12e2bb77bdb7aa7b8468"/></dir><file name="Totals.php" hash="da5b3fe05aca0194f12dcc239be47d45"/></dir></dir></dir></dir><dir name="Customer"><dir name="Address"><file name="Edit.php" hash="29852467e29ecd706303e0ffc85ed009"/></dir></dir><dir name="Onepage"><dir name="Billing"><file name="Billing.php" hash="d9e3d433518bfd225b4774389eaa6507"/></dir><file name="Paymentinfo.php" hash="9dbd9cc6e2587e222cc3c9c72beff46a"/><file name="Pickupform.php" hash="6185b390e0438a3c588d3bf8362c54cc"/><dir name="Shipping"><dir name="Method"><file name="Available.php" hash="72f3789bb35612be09bb50f6f9f1b443"/></dir><file name="Shipping.php" hash="8f27033a68264f2f2f45fa808cbe7751"/></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="f87f9903ff7b03630377b9a5e0def6a6"/><file name="Exceptionmap.php" hash="5efa0d9221546f4a3b29f98d260998a8"/><file name="Transliterate.php" hash="fc82a61a3c5efe1c5f5c4ea5a21cdeea"/><dir name="Validate"><file name="Address.php" hash="ad1aea0ca237b264d066f82028e832b2"/></dir></dir><dir name="Model"><dir name="Autocomplete"><file name="Address.php" hash="6e0780587160d8ee59cbadc6f1224a30"/></dir><dir name="Carrier"><dir name="Receiverdata"><file name="Receiverdata.php" hash="fc9e1cef902f8126705493ef62698975"/></dir><dir name="Senderdata"><file name="Senderdata.php" hash="a29434d47a760d0b26c05da5ce5a8053"/></dir><file name="Shippingmethod.php" hash="353be360fc9b6d4a7a287394ebfa7fae"/><dir name="Source"><file name="Calculation.php" hash="7d5e43623523d7bc78cb3eac887d7180"/><file name="Deferreddays.php" hash="c0b4154d31d5080a5970eab4ba5f9315"/><file name="Method.php" hash="3a27c91b9c707dd9204baf7ffa814a12"/><file name="Office.php" hash="38d718531131f17dc452a72370d7e5f6"/></dir></dir><file name="Observer.php" hash="8dcb88f716b76e5b9f8a05b6e2c79851"/><dir name="Rate"><file name="Result.php" hash="9e57224fe86a696a8c51e47c1808226f"/></dir><dir name="Resource"><dir name="Saveorder"><file name="Collection.php" hash="45cbc13c07ab7ac7e495bdead549c655"/></dir><file name="Saveorder.php" hash="ebb22be5c4334a201bd6b09d72e96cbe"/><file name="Setup.php" hash="f4fd4f27ba10a9fc68e272a475ff2156"/></dir><dir name="Sales"><dir name="Quote"><dir name="Address"><file name="Rate.php" hash="82282b54b161255665c888ff9cd7fc6d"/></dir></dir></dir><file name="Saveorder.php" hash="4bbd01470d9ffa1d305fcf7210f88726"/></dir><dir name="controllers"><file name="AddressController.php" hash="42edea2936784d3f00d4780dc2a640ed"/><dir name="Adminhtml"><file name="AddressController.php" hash="adbc2db67d5bc7702d8c33361fdcbfd1"/><file name="PrintController.php" hash="18bf9001fc7f249485548f7b99ffc71c"/></dir></dir><dir name="etc"><file name="config.xml" hash="34b1ba4a9e92483c887ce746fe576dc8"/><file name="system.xml" hash="b44c12d60310eec180b255b578d0c5be"/></dir><dir name="sql"><dir name="speedyshippingmodule_setup"><file name="mysql4-install-1.0.3.php" hash="e47bd46333355a9e1fe5884ed0ad7f2e"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="speedy_shipping.xml" hash="93bad292fed577e9c79c830aa47ebd61"/></dir><dir name="template"><dir name="speedy_speedyshipping"><file name="billoflading.phtml" hash="44981d930bbed7485a275827e861fc91"/><file name="billoflading.phtml~" hash="b29e6f923ba1bec0761071582b9b472b"/><dir name="customer"><dir name="edit"><dir name="tab"><file name="addresses.phtml" hash="d30d71600b33872075dc0bc2b7bc3137"/></dir></dir></dir><file name="pickupform.phtml" hash="9466207e1d385afeb741bbf9241d2d16"/><file name="pickupform.phtml~" hash="07c53c0eeae9482560ec9c5101545563"/><dir name="sales"><dir name="order"><dir name="create"><dir name="billing"><dir name="method"><file name="paymentInfo.phtml" hash="95b62beb6ea8713e22754ce4ca7e0bd2"/><file name="paymentInfo.phtml~" hash="ded4b2492be4918d62533b0c839687df"/></dir></dir><dir name="form"><file name="address.phtml" hash="07c6532334623f427f8ae8c44207564a"/><file name="address.phtml~" hash="f168bee3b4090c64bc9613cdaeec4552"/></dir><dir name="shipping"><dir name="method"><file name="form.phtml" hash="b5f040a5519c9625f363a0569b8b2488"/><file name="form.phtml~" hash="b5f040a5519c9625f363a0569b8b2488"/></dir></dir><file name="totals.phtml" hash="cada285fd005956398d6d1d18d437892"/><file name="totals.phtml~" hash="cada285fd005956398d6d1d18d437892"/></dir></dir></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="speedy_shipping.xml" hash="5f02e9289e6246a9d1ef89742c15b189"/></dir><dir name="template"><dir name="speedy_speedyshipping"><dir name="checkout"><dir name="onepage"><file name="billing.phtml" hash="0bd56002e494fd68ddd3a0b0ace6f189"/><dir name="payment_method"><file name="paymentInfo.phtml" hash="90744624e431865c4f9b1bb8f3e88cf0"/></dir><file name="shipping.phtml" hash="c9e03fd1adfb53abd26d71941fe207e7"/><dir name="shipping_method"><file name="available.phtml" hash="fb72213016fd67183f325e6f964c9946"/><file name="pickupform.phtml" hash="e2ae7da20aa170ea05239966a50a3851"/><file name="shipping_method.phtml" hash="8683ed86bd37ca7de4ce2305f92b4aea"/></dir></dir></dir><dir name="customer"><dir name="address"><file name="edit.phtml" hash="46d68ab0634c58b59314f8317331ae84"/></dir></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Speedyshipping.xml" hash="174bd7fc593803de29596d2e8e91f956"/></dir></target><target name="magelib"><dir name="SpeedyEPS"><dir name="util"><file name="Util.class.php" hash="3ab58ce524807ad46ca0a5f61ef54880"/></dir><dir name="ver01"><file name="AddrNomen.class.php" hash="76b8c168b03faa92f0f7d88c9ff1ac9d"/><file name="ClientException.class.php" hash="f6c7b7fc1f7688c34a8cf08174984bc0"/><file name="ComplementaryServiceAllowance.class.php" hash="3c19719bf8259ff11911a5b7efe48162"/><file name="EPSFacade.class.php" hash="e76648c744f3576afdf8f21ad5b0deb5"/><file name="EPSInterface.class.php" hash="364b502ff4b886cfaca845aae0071677"/><file name="FixedDiscountCardId.class.php" hash="c1a5b1fbe82c0f3e1255d58a553d868a"/><file name="ParamAddress.class.php" hash="9909379d2c137f8abcfe923184099913"/><file name="ParamAddressSearch.class.php" hash="1aa38443a890cdac4c72ef060c4a2b38"/><file name="ParamBarcodeInfo.class.php" hash="093c8ebe0af5ecc116027ef5e7c34963"/><file name="ParamCalculation.class.php" hash="a5810270eea55575091f2bdfa2d01809"/><file name="ParamClientData.class.php" hash="5372f9b3c0a5ba0afe7e03ffb864ad2f"/><file name="ParamClientSearch.class.php" hash="1635cf5cab0938c0b3841ab44e6ffa85"/><file name="ParamFilterSite.class.php" hash="d6779be70c4b3dbd3b46107e2376d24e"/><file name="ParamLanguage.class.php" hash="45948d35e08ea3603f14188aa749a183"/><file name="ParamOrder.class.php" hash="d5c313213948de49caf4cc6258aa6a45"/><file name="ParamPDF.class.php" hash="15ede157a824a7f40dffce6920cf6393"/><file name="ParamParcel.class.php" hash="5fb683f33a075172d388812446e6c08d"/><file name="ParamParcelInfo.class.php" hash="2246e4b0c6afb0088d9ee8eb2404cca3"/><file name="ParamPhoneNumber.class.php" hash="5b7fcf54cb3411c11af4837a580358f1"/><file name="ParamPicking.class.php" hash="410e0a7ffac91278f409c90986e532df"/><file name="ParamPicking.class.php~" hash="2ec45324d98bccf7eb4deb700d16b7bc"/><file name="ParamSearchByRefNum.class.php" hash="6fc27f25f4bbca373be1d93cb1dcc14a"/><file name="ResultAddress.class.php" hash="e5107cd6b9b4b5746ee0ec99c46b810b"/><file name="ResultAddressSearch.class.php" hash="ff6c6d71bb2a9a8f1665d32d7508bad2"/><file name="ResultAmounts.class.php" hash="4faa2ba701861a9e8b7d564abbed3932"/><file name="ResultBOL.class.php" hash="97dd9ccb3220e6527ff2ce64d4b549f2"/><file name="ResultCalculation.class.php" hash="98186469364caa296ad1cef1e7b5cf2c"/><file name="ResultCalculationMS.class.php" hash="ea2183e0dce591413af835444cdb354f"/><file name="ResultClientData.class.php" hash="b60023b5d7d9aabe165e9e81cf77cadd"/><file name="ResultCommonObject.class.php" hash="85c8215a0494419500989a32494572f3"/><file name="ResultCourierService.class.php" hash="22af6f05b3c12f1e19a77261943e2736"/><file name="ResultCourierServiceExt.class.php" hash="a6a7a6e010b68cbdf979551607d167a0"/><file name="ResultLogin.class.php" hash="f6a7faec19df8aa7ce949a62dcde2eed"/><file name="ResultMinMaxReal.class.php" hash="5bfaec9dc14bd89f22b500f420ba105b"/><file name="ResultOffice.class.php" hash="29cceaff82231ea2b1b9c10a114eff39"/><file name="ResultOrderPickingInfo.class.php" hash="c2e63290948103310f5225c04a3fc926"/><file name="ResultParcelInfo.class.php" hash="735a6a87ca6782888efb4af9a16a058d"/><file name="ResultPhoneNumber.class.php" hash="819224fa8152f2eca10a012d9f6320a7"/><file name="ResultQuarter.class.php" hash="4d280afd09edc2777a34252b40ed8524"/><file name="ResultSite.class.php" hash="0015c2d3786fc999a556459458a295ae"/><file name="ResultSiteEx.class.php" hash="cf09cf3da53a3a1b7c27e9be69766731"/><file name="ResultStreet.class.php" hash="69c5c79d76f1924f0ce011f3e3666539"/><file name="ResultTrackPicking.class.php" hash="4998f1e500ef13073633626c96a526f5"/><file name="ResultTrackPickingEx.class.php" hash="d50aa504123a5ced9d83cc538e7aaf98"/><file name="ServerException.class.php" hash="66a766c5a18062a4a53ec70452c21e97"/><file name="Size.class.php" hash="effe8ab18c3cc5560f4aa39771b9bcbe"/><file name="ValueAddress.class.php" hash="2669535c76c7f045730edee6eb2c6a15"/><dir name="soap"><file name="EPSSOAPInterfaceImpl.class.php" hash="cde457da0afd8cb10b2945269f282fde"/></dir></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="speedy"><dir name="css"><file name="hideEditAddress.css" hash="1b03b3bf871c23565428454442c88cad"/><dir name="images"><file name="animated-overlay.gif" hash="2b912f7c0653008ca28ebacda49025e7"/><file name="ui-bg_diagonals-thick_18_b81900_40x40.png" hash="adffefb9419589d6b897a81877e85e42"/><file name="ui-bg_diagonals-thick_20_666666_40x40.png" hash="5a6524e1e6c434435238b5c93e583b6f"/><file name="ui-bg_flat_10_000000_40x100.png" hash="3d978d04a04f319ce2412b1c11afa926"/><file name="ui-bg_glass_100_f6f6f6_1x400.png" hash="bb29642d42ead99b3f719a1c7c838026"/><file name="ui-bg_glass_100_fdf5ce_1x400.png" hash="dc52f3b6718f318deb7813c5115137c5"/><file name="ui-bg_glass_65_ffffff_1x400.png" hash="e25e9547ddaa4fad97741b252ba9f800"/><file name="ui-bg_gloss-wave_35_f6a828_500x100.png" hash="661db0dc3da9538d25ffd010dc514751"/><file name="ui-bg_highlight-soft_100_eeeeee_1x100.png" hash="d78652f40e0c1f0281988aacd8269833"/><file name="ui-bg_highlight-soft_75_ffe45c_1x100.png" hash="3d9bb8f4d52f22fd5d494e87518766c0"/><file name="ui-icons_222222_256x240.png" hash="a1b3887a86cf1791f23c0b53b4d3585f"/><file name="ui-icons_228ef1_256x240.png" hash="73044fed6bab2c5ed02eed93b7d3adaa"/><file name="ui-icons_ef8c08_256x240.png" hash="1eec256e4f7b8324e619aae36ecfbfbd"/><file name="ui-icons_ffd27a_256x240.png" hash="c1a79bd65be08aa2be391cba2321f448"/><file name="ui-icons_ffffff_256x240.png" hash="e3f4748b19b87aadaa924d85f0882432"/></dir><file name="jquery-ui-1.10.2.custom.min.css" hash="63a7972fe14211955df1b5631d2bfba1"/><file name="jquery.autocomplete.css" hash="e1efb0a6e3da2b6ac201dc98c585aec8"/></dir><dir name="images"><file name="indicator.gif" hash="03ce3dcc84af110e9da8699a841e5200"/></dir><dir name="js"><file name="jquery-1.9.1.min.js" hash="ba714fde311a118967b9d8cb017c81f6"/><file name="jquery-ui-1.10.2.custom.min.js" hash="34f617d6fa9771c9cec61e9f6b729cf4"/><file name="noconflict.js" hash="e2060c4e5e5955c824723b13a212d3ec"/><file name="office_pickup.js" hash="9179598fcbec42db94cef23b1c1c11b9"/><file name="validateAddress.js" hash="c3ca1e26625b3fabaadd089d37d1e299"/></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="speedy"><dir name="css"><dir name="images"><file name="animated-overlay.gif" hash="2b912f7c0653008ca28ebacda49025e7"/><dir name="images"><file name="animated-overlay.gif" hash="2b912f7c0653008ca28ebacda49025e7"/><file name="ui-bg_diagonals-thick_18_b81900_40x40.png" hash="8bede029bbc5dfdc51c03c31c42c69b6"/><file name="ui-bg_diagonals-thick_20_666666_40x40.png" hash="0e22f1e0b51bab992d835373d8687aff"/><file name="ui-bg_flat_10_000000_40x100.png" hash="f1d874a7f2f98005ef41142e7c529afb"/><file name="ui-bg_glass_100_f6f6f6_1x400.png" hash="0239611116cbcf93c7cd902997df0c2b"/><file name="ui-bg_glass_100_fdf5ce_1x400.png" hash="e08a0b044bc2699a3dd6ac4d081736d4"/><file name="ui-bg_glass_65_ffffff_1x400.png" hash="d985d3e1f3980efaa8a9482da6282a6a"/><file name="ui-bg_gloss-wave_35_f6a828_500x100.png" hash="22d6e00af67ff329b00e70164acbfa6e"/><file name="ui-bg_highlight-soft_100_eeeeee_1x100.png" hash="148fa5a4d59240f3b1322e52c0b42646"/><file name="ui-bg_highlight-soft_75_ffe45c_1x100.png" hash="8a5e1b98c9b8a758fb45e982724cc1d0"/><file name="ui-icons_222222_256x240.png" hash="a1b3887a86cf1791f23c0b53b4d3585f"/><file name="ui-icons_228ef1_256x240.png" hash="73044fed6bab2c5ed02eed93b7d3adaa"/><file name="ui-icons_ef8c08_256x240.png" hash="1eec256e4f7b8324e619aae36ecfbfbd"/><file name="ui-icons_ffd27a_256x240.png" hash="c1a79bd65be08aa2be391cba2321f448"/><file name="ui-icons_ffffff_256x240.png" hash="e3f4748b19b87aadaa924d85f0882432"/></dir><file name="ui-bg_diagonals-thick_18_b81900_40x40.png" hash="adffefb9419589d6b897a81877e85e42"/><file name="ui-bg_diagonals-thick_20_666666_40x40.png" hash="5a6524e1e6c434435238b5c93e583b6f"/><file name="ui-bg_flat_10_000000_40x100.png" hash="3d978d04a04f319ce2412b1c11afa926"/><file name="ui-bg_glass_100_f6f6f6_1x400.png" hash="bb29642d42ead99b3f719a1c7c838026"/><file name="ui-bg_glass_100_fdf5ce_1x400.png" hash="dc52f3b6718f318deb7813c5115137c5"/><file name="ui-bg_glass_65_ffffff_1x400.png" hash="e25e9547ddaa4fad97741b252ba9f800"/><file name="ui-bg_gloss-wave_35_f6a828_500x100.png" hash="661db0dc3da9538d25ffd010dc514751"/><file name="ui-bg_highlight-soft_100_eeeeee_1x100.png" hash="d78652f40e0c1f0281988aacd8269833"/><file name="ui-bg_highlight-soft_75_ffe45c_1x100.png" hash="3d9bb8f4d52f22fd5d494e87518766c0"/><file name="ui-icons_222222_256x240.png" hash="a1b3887a86cf1791f23c0b53b4d3585f"/><file name="ui-icons_228ef1_256x240.png" hash="73044fed6bab2c5ed02eed93b7d3adaa"/><file name="ui-icons_ef8c08_256x240.png" hash="1eec256e4f7b8324e619aae36ecfbfbd"/><file name="ui-icons_ffd27a_256x240.png" hash="c1a79bd65be08aa2be391cba2321f448"/><file name="ui-icons_ffffff_256x240.png" hash="e3f4748b19b87aadaa924d85f0882432"/></dir><file name="jquery-ui-1.10.2.custom.min.css" hash="b14e6e4dfddacb48689578a9f9b69837"/><file name="jquery-ui-1.10.3.custom.min.css" hash="61770a422674ed451871ecdcf75ea67d"/><file name="jquery.autocomplete.css" hash="e1efb0a6e3da2b6ac201dc98c585aec8"/></dir><dir name="images"><file name="indicator.gif" hash="14c56c5a40e61aea738e46b66d4d8c90"/></dir><dir name="js"><file name="jquery-1.9.1.min.js" hash="64bfec2cb1cc2bf57e66c0c8e519d170"/><file name="jquery-ui-1.10.3.custom.min.js" hash="ca78f74e4ebf73b646c14f7803031e48"/><file name="noconflict.js" hash="e2060c4e5e5955c824723b13a212d3ec"/><file name="office_pickup.js" hash="aa6e2190262bd3079d1000c319a7e7aa"/></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="bg_BG"><file name="speedyTranslate.csv" hash="76023d2b49fbf22f24390cd678003343"/></dir></target></contents>
16
  <compatible/>
17
  <dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php><package><name>Mage_Core_Modules</name><channel>community</channel><min>1.7.0.2</min><max>1.8.0.0</max></package><extension><name>soap</name><min></min><max></max></extension></required></dependencies>
18
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Speedy_Shipping</name>
4
+ <version>1.0.7</version>
5
  <stability>stable</stability>
6
  <license>Open Software License (OSL 3.0)</license>
7
  <channel>community</channel>
8
  <extends/>
9
+ <summary>Second release</summary>
10
+ <description>Second release</description>
11
+ <notes>Second release</notes>
12
  <authors><author><name>Speedy</name><user>evgeni</user><email>evgeni@omg-m.com</email></author></authors>
13
+ <date>2013-12-20</date>
14
+ <time>15:46:12</time>
15
+ <contents><target name="magecommunity"><dir name="Speedy"><dir name="Speedyshipping"><dir name="Block"><dir name="Adminhtml"><file name="Billoflading.php" hash="5ff4f88bece3607c615152f78c448520"/><dir name="Requestcourier"><file name="Grid.php" hash="1cf35ad632bbfd748acc377294ceaa64"/><dir name="Renderer"><file name="Cancelbutton.php" hash="895663d2b4a3ed8ef83a2f47cc1260c3"/><file name="Created.php" hash="e4319a0fd1c80d0e9164bf678f8a509f"/><file name="Requestbutton.php" hash="66fe360ec85a73a27200e7f83ab9b9a7"/><file name="Viewbol.php" hash="f5a61d534ece18b78907207411cae952"/><file name="Vieworder.php" hash="fb6c0ac4134d26a705f2c7bdc658f035"/></dir><file name="Requestcontainer.php" hash="bf03f9fdef44ac754ebfc89b136a1580"/></dir><dir name="Sales"><dir name="Order"><dir name="Create"><dir name="Billing"><file name="Address.php" hash="575ebbda49b25e95f37bca49cfba623d"/></dir><dir name="Shipping"><file name="Address.php" hash="14c1dc61fcfa00a7f685e2c025f31901"/><file name="Form.php" hash="90112a2a3ed59b021d8fcd347e7b5292"/></dir><dir name="Speedy"><file name="Form.php" hash="5d33815cc6bf12e2bb77bdb7aa7b8468"/></dir><file name="Totals.php" hash="da5b3fe05aca0194f12dcc239be47d45"/></dir></dir></dir></dir><dir name="Customer"><dir name="Address"><file name="Edit.php" hash="29852467e29ecd706303e0ffc85ed009"/></dir></dir><dir name="Onepage"><dir name="Billing"><file name="Billing.php" hash="d9e3d433518bfd225b4774389eaa6507"/></dir><file name="Paymentinfo.php" hash="e8f37098f3cd8c820d30db33d6c8bb51"/><file name="Pickupform.php" hash="6185b390e0438a3c588d3bf8362c54cc"/><dir name="Shipping"><dir name="Method"><file name="Available.php" hash="72f3789bb35612be09bb50f6f9f1b443"/></dir><file name="Shipping.php" hash="8f27033a68264f2f2f45fa808cbe7751"/></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="f87f9903ff7b03630377b9a5e0def6a6"/><file name="Exceptionmap.php" hash="5efa0d9221546f4a3b29f98d260998a8"/><file name="Transliterate.php" hash="fc82a61a3c5efe1c5f5c4ea5a21cdeea"/><dir name="Validate"><file name="Address.php" hash="ad1aea0ca237b264d066f82028e832b2"/></dir></dir><dir name="Model"><dir name="Autocomplete"><file name="Address.php" hash="89a22a6ab16f780ad0e6f2c343d183be"/></dir><dir name="Carrier"><dir name="Receiverdata"><file name="Receiverdata.php" hash="fc9e1cef902f8126705493ef62698975"/></dir><dir name="Senderdata"><file name="Senderdata.php" hash="a29434d47a760d0b26c05da5ce5a8053"/></dir><file name="Shippingmethod.php" hash="1e8c20eebcc347e924d34be9304d3551"/><dir name="Source"><file name="Calculation.php" hash="7d5e43623523d7bc78cb3eac887d7180"/><file name="Deferreddays.php" hash="c0b4154d31d5080a5970eab4ba5f9315"/><file name="Method.php" hash="3a27c91b9c707dd9204baf7ffa814a12"/><file name="Office.php" hash="38d718531131f17dc452a72370d7e5f6"/></dir></dir><file name="Observer.php" hash="8dcb88f716b76e5b9f8a05b6e2c79851"/><dir name="Rate"><file name="Result.php" hash="9e57224fe86a696a8c51e47c1808226f"/></dir><dir name="Resource"><dir name="Saveorder"><file name="Collection.php" hash="45cbc13c07ab7ac7e495bdead549c655"/></dir><file name="Saveorder.php" hash="ebb22be5c4334a201bd6b09d72e96cbe"/><file name="Setup.php" hash="f4fd4f27ba10a9fc68e272a475ff2156"/></dir><dir name="Sales"><dir name="Quote"><dir name="Address"><file name="Rate.php" hash="82282b54b161255665c888ff9cd7fc6d"/></dir></dir></dir><file name="Saveorder.php" hash="4bbd01470d9ffa1d305fcf7210f88726"/></dir><dir name="controllers"><file name="AddressController.php" hash="42edea2936784d3f00d4780dc2a640ed"/><dir name="Adminhtml"><file name="AddressController.php" hash="adbc2db67d5bc7702d8c33361fdcbfd1"/><file name="PrintController.php" hash="c722b2a189a64c9e70cb7e9e3836fd24"/></dir></dir><dir name="etc"><file name="config.xml" hash="a8162ce42bbdd7d7141b406033a11d72"/><file name="system.xml" hash="b44c12d60310eec180b255b578d0c5be"/></dir><dir name="sql"><dir name="speedyshippingmodule_setup"><file name="mysql4-install-1.0.3.php" hash="e47bd46333355a9e1fe5884ed0ad7f2e"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="speedy_shipping.xml" hash="93bad292fed577e9c79c830aa47ebd61"/></dir><dir name="template"><dir name="speedy_speedyshipping"><file name="billoflading.phtml" hash="9e366339161b40450c06b6a308563858"/><dir name="customer"><dir name="edit"><dir name="tab"><file name="addresses.phtml" hash="d30d71600b33872075dc0bc2b7bc3137"/></dir></dir></dir><file name="pickupform.phtml" hash="3d148363527cf10c0fa8a3aa1c692ac7"/><dir name="sales"><dir name="order"><dir name="create"><dir name="billing"><dir name="method"><file name="paymentInfo.phtml" hash="6ddeb20940f4bc37b6b04bd8edaa8976"/></dir></dir><dir name="form"><file name="address.phtml" hash="89f7c6fed1c073f771d47783f74607b9"/></dir><dir name="shipping"><dir name="method"><file name="form.phtml" hash="b5f040a5519c9625f363a0569b8b2488"/></dir></dir><file name="totals.phtml" hash="cada285fd005956398d6d1d18d437892"/></dir></dir></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="speedy_shipping.xml" hash="5f02e9289e6246a9d1ef89742c15b189"/></dir><dir name="template"><dir name="speedy_speedyshipping"><dir name="checkout"><dir name="onepage"><file name="billing.phtml" hash="aa31e2d8ed516b9a2bb83ecd615c3acc"/><dir name="payment_method"><file name="paymentInfo.phtml" hash="2dab065f047e4930a3aca4ad892c441f"/></dir><file name="shipping.phtml" hash="8218d46b80cf05cc9a3f5aae8f3490b9"/><dir name="shipping_method"><file name="available.phtml" hash="fb72213016fd67183f325e6f964c9946"/><file name="pickupform.phtml" hash="3532d6961b4744b1a1585704885fd4ed"/><file name="shipping_method.phtml" hash="8683ed86bd37ca7de4ce2305f92b4aea"/></dir></dir></dir><dir name="customer"><dir name="address"><file name="edit.phtml" hash="312b8c51c05b2855e986f9c19d4686f7"/></dir></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Speedyshipping.xml" hash="8c0140e2babc0757f6c350f0f74c80fc"/></dir></target><target name="magelib"><dir name="SpeedyEPS"><dir name="util"><file name="Util.class.php" hash="3ab58ce524807ad46ca0a5f61ef54880"/></dir><dir name="ver01"><file name="AddrNomen.class.php" hash="76b8c168b03faa92f0f7d88c9ff1ac9d"/><file name="ClientException.class.php" hash="f6c7b7fc1f7688c34a8cf08174984bc0"/><file name="ComplementaryServiceAllowance.class.php" hash="3c19719bf8259ff11911a5b7efe48162"/><file name="EPSFacade.class.php" hash="e76648c744f3576afdf8f21ad5b0deb5"/><file name="EPSInterface.class.php" hash="364b502ff4b886cfaca845aae0071677"/><file name="FixedDiscountCardId.class.php" hash="c1a5b1fbe82c0f3e1255d58a553d868a"/><file name="ParamAddress.class.php" hash="9909379d2c137f8abcfe923184099913"/><file name="ParamAddressSearch.class.php" hash="1aa38443a890cdac4c72ef060c4a2b38"/><file name="ParamBarcodeInfo.class.php" hash="093c8ebe0af5ecc116027ef5e7c34963"/><file name="ParamCalculation.class.php" hash="a5810270eea55575091f2bdfa2d01809"/><file name="ParamClientData.class.php" hash="5372f9b3c0a5ba0afe7e03ffb864ad2f"/><file name="ParamClientSearch.class.php" hash="1635cf5cab0938c0b3841ab44e6ffa85"/><file name="ParamFilterSite.class.php" hash="d6779be70c4b3dbd3b46107e2376d24e"/><file name="ParamLanguage.class.php" hash="45948d35e08ea3603f14188aa749a183"/><file name="ParamOrder.class.php" hash="d5c313213948de49caf4cc6258aa6a45"/><file name="ParamPDF.class.php" hash="15ede157a824a7f40dffce6920cf6393"/><file name="ParamParcel.class.php" hash="5fb683f33a075172d388812446e6c08d"/><file name="ParamParcelInfo.class.php" hash="2246e4b0c6afb0088d9ee8eb2404cca3"/><file name="ParamPhoneNumber.class.php" hash="5b7fcf54cb3411c11af4837a580358f1"/><file name="ParamPicking.class.php" hash="410e0a7ffac91278f409c90986e532df"/><file name="ParamSearchByRefNum.class.php" hash="6fc27f25f4bbca373be1d93cb1dcc14a"/><file name="ResultAddress.class.php" hash="e5107cd6b9b4b5746ee0ec99c46b810b"/><file name="ResultAddressSearch.class.php" hash="ff6c6d71bb2a9a8f1665d32d7508bad2"/><file name="ResultAmounts.class.php" hash="4faa2ba701861a9e8b7d564abbed3932"/><file name="ResultBOL.class.php" hash="97dd9ccb3220e6527ff2ce64d4b549f2"/><file name="ResultCalculation.class.php" hash="98186469364caa296ad1cef1e7b5cf2c"/><file name="ResultCalculationMS.class.php" hash="ea2183e0dce591413af835444cdb354f"/><file name="ResultClientData.class.php" hash="b60023b5d7d9aabe165e9e81cf77cadd"/><file name="ResultCommonObject.class.php" hash="85c8215a0494419500989a32494572f3"/><file name="ResultCourierService.class.php" hash="22af6f05b3c12f1e19a77261943e2736"/><file name="ResultCourierServiceExt.class.php" hash="a6a7a6e010b68cbdf979551607d167a0"/><file name="ResultLogin.class.php" hash="f6a7faec19df8aa7ce949a62dcde2eed"/><file name="ResultMinMaxReal.class.php" hash="5bfaec9dc14bd89f22b500f420ba105b"/><file name="ResultOffice.class.php" hash="29cceaff82231ea2b1b9c10a114eff39"/><file name="ResultOrderPickingInfo.class.php" hash="c2e63290948103310f5225c04a3fc926"/><file name="ResultParcelInfo.class.php" hash="735a6a87ca6782888efb4af9a16a058d"/><file name="ResultPhoneNumber.class.php" hash="819224fa8152f2eca10a012d9f6320a7"/><file name="ResultQuarter.class.php" hash="4d280afd09edc2777a34252b40ed8524"/><file name="ResultSite.class.php" hash="0015c2d3786fc999a556459458a295ae"/><file name="ResultSiteEx.class.php" hash="cf09cf3da53a3a1b7c27e9be69766731"/><file name="ResultStreet.class.php" hash="69c5c79d76f1924f0ce011f3e3666539"/><file name="ResultTrackPicking.class.php" hash="4998f1e500ef13073633626c96a526f5"/><file name="ResultTrackPickingEx.class.php" hash="d50aa504123a5ced9d83cc538e7aaf98"/><file name="ServerException.class.php" hash="66a766c5a18062a4a53ec70452c21e97"/><file name="Size.class.php" hash="effe8ab18c3cc5560f4aa39771b9bcbe"/><file name="ValueAddress.class.php" hash="2669535c76c7f045730edee6eb2c6a15"/><dir name="soap"><file name="EPSSOAPInterfaceImpl.class.php" hash="cde457da0afd8cb10b2945269f282fde"/></dir></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="speedy"><dir name="css"><file name="hideEditAddress.css" hash="1b03b3bf871c23565428454442c88cad"/><dir name="images"><file name="animated-overlay.gif" hash="2b912f7c0653008ca28ebacda49025e7"/><file name="ui-bg_diagonals-thick_18_b81900_40x40.png" hash="adffefb9419589d6b897a81877e85e42"/><file name="ui-bg_diagonals-thick_20_666666_40x40.png" hash="5a6524e1e6c434435238b5c93e583b6f"/><file name="ui-bg_flat_10_000000_40x100.png" hash="3d978d04a04f319ce2412b1c11afa926"/><file name="ui-bg_glass_100_f6f6f6_1x400.png" hash="bb29642d42ead99b3f719a1c7c838026"/><file name="ui-bg_glass_100_fdf5ce_1x400.png" hash="dc52f3b6718f318deb7813c5115137c5"/><file name="ui-bg_glass_65_ffffff_1x400.png" hash="e25e9547ddaa4fad97741b252ba9f800"/><file name="ui-bg_gloss-wave_35_f6a828_500x100.png" hash="661db0dc3da9538d25ffd010dc514751"/><file name="ui-bg_highlight-soft_100_eeeeee_1x100.png" hash="d78652f40e0c1f0281988aacd8269833"/><file name="ui-bg_highlight-soft_75_ffe45c_1x100.png" hash="3d9bb8f4d52f22fd5d494e87518766c0"/><file name="ui-icons_222222_256x240.png" hash="a1b3887a86cf1791f23c0b53b4d3585f"/><file name="ui-icons_228ef1_256x240.png" hash="73044fed6bab2c5ed02eed93b7d3adaa"/><file name="ui-icons_ef8c08_256x240.png" hash="1eec256e4f7b8324e619aae36ecfbfbd"/><file name="ui-icons_ffd27a_256x240.png" hash="c1a79bd65be08aa2be391cba2321f448"/><file name="ui-icons_ffffff_256x240.png" hash="e3f4748b19b87aadaa924d85f0882432"/></dir><file name="jquery-ui-1.10.2.custom.min.css" hash="63a7972fe14211955df1b5631d2bfba1"/><file name="jquery.autocomplete.css" hash="e1efb0a6e3da2b6ac201dc98c585aec8"/></dir><dir name="images"><file name="indicator.gif" hash="03ce3dcc84af110e9da8699a841e5200"/></dir><dir name="js"><file name="jquery-1.9.1.min.js" hash="ba714fde311a118967b9d8cb017c81f6"/><file name="jquery-ui-1.10.2.custom.min.js" hash="34f617d6fa9771c9cec61e9f6b729cf4"/><file name="noconflict.js" hash="e2060c4e5e5955c824723b13a212d3ec"/><file name="office_pickup.js" hash="9179598fcbec42db94cef23b1c1c11b9"/><file name="validateAddress.js" hash="038138a28bb228c9cc3ce3aed93f6e74"/></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="speedy"><dir name="css"><dir name="images"><file name="animated-overlay.gif" hash="2b912f7c0653008ca28ebacda49025e7"/><dir name="images"><file name="animated-overlay.gif" hash="2b912f7c0653008ca28ebacda49025e7"/><file name="ui-bg_diagonals-thick_18_b81900_40x40.png" hash="8bede029bbc5dfdc51c03c31c42c69b6"/><file name="ui-bg_diagonals-thick_20_666666_40x40.png" hash="0e22f1e0b51bab992d835373d8687aff"/><file name="ui-bg_flat_10_000000_40x100.png" hash="f1d874a7f2f98005ef41142e7c529afb"/><file name="ui-bg_glass_100_f6f6f6_1x400.png" hash="0239611116cbcf93c7cd902997df0c2b"/><file name="ui-bg_glass_100_fdf5ce_1x400.png" hash="e08a0b044bc2699a3dd6ac4d081736d4"/><file name="ui-bg_glass_65_ffffff_1x400.png" hash="d985d3e1f3980efaa8a9482da6282a6a"/><file name="ui-bg_gloss-wave_35_f6a828_500x100.png" hash="22d6e00af67ff329b00e70164acbfa6e"/><file name="ui-bg_highlight-soft_100_eeeeee_1x100.png" hash="148fa5a4d59240f3b1322e52c0b42646"/><file name="ui-bg_highlight-soft_75_ffe45c_1x100.png" hash="8a5e1b98c9b8a758fb45e982724cc1d0"/><file name="ui-icons_222222_256x240.png" hash="a1b3887a86cf1791f23c0b53b4d3585f"/><file name="ui-icons_228ef1_256x240.png" hash="73044fed6bab2c5ed02eed93b7d3adaa"/><file name="ui-icons_ef8c08_256x240.png" hash="1eec256e4f7b8324e619aae36ecfbfbd"/><file name="ui-icons_ffd27a_256x240.png" hash="c1a79bd65be08aa2be391cba2321f448"/><file name="ui-icons_ffffff_256x240.png" hash="e3f4748b19b87aadaa924d85f0882432"/></dir><file name="ui-bg_diagonals-thick_18_b81900_40x40.png" hash="adffefb9419589d6b897a81877e85e42"/><file name="ui-bg_diagonals-thick_20_666666_40x40.png" hash="5a6524e1e6c434435238b5c93e583b6f"/><file name="ui-bg_flat_10_000000_40x100.png" hash="3d978d04a04f319ce2412b1c11afa926"/><file name="ui-bg_glass_100_f6f6f6_1x400.png" hash="bb29642d42ead99b3f719a1c7c838026"/><file name="ui-bg_glass_100_fdf5ce_1x400.png" hash="dc52f3b6718f318deb7813c5115137c5"/><file name="ui-bg_glass_65_ffffff_1x400.png" hash="e25e9547ddaa4fad97741b252ba9f800"/><file name="ui-bg_gloss-wave_35_f6a828_500x100.png" hash="661db0dc3da9538d25ffd010dc514751"/><file name="ui-bg_highlight-soft_100_eeeeee_1x100.png" hash="d78652f40e0c1f0281988aacd8269833"/><file name="ui-bg_highlight-soft_75_ffe45c_1x100.png" hash="3d9bb8f4d52f22fd5d494e87518766c0"/><file name="ui-icons_222222_256x240.png" hash="a1b3887a86cf1791f23c0b53b4d3585f"/><file name="ui-icons_228ef1_256x240.png" hash="73044fed6bab2c5ed02eed93b7d3adaa"/><file name="ui-icons_ef8c08_256x240.png" hash="1eec256e4f7b8324e619aae36ecfbfbd"/><file name="ui-icons_ffd27a_256x240.png" hash="c1a79bd65be08aa2be391cba2321f448"/><file name="ui-icons_ffffff_256x240.png" hash="e3f4748b19b87aadaa924d85f0882432"/></dir><file name="jquery-ui-1.10.2.custom.min.css" hash="b14e6e4dfddacb48689578a9f9b69837"/><file name="jquery-ui-1.10.3.custom.min.css" hash="61770a422674ed451871ecdcf75ea67d"/><file name="jquery.autocomplete.css" hash="e1efb0a6e3da2b6ac201dc98c585aec8"/></dir><dir name="images"><file name="indicator.gif" hash="14c56c5a40e61aea738e46b66d4d8c90"/></dir><dir name="js"><file name="jquery-1.9.1.min.js" hash="64bfec2cb1cc2bf57e66c0c8e519d170"/><file name="jquery-ui-1.10.3.custom.min.js" hash="ca78f74e4ebf73b646c14f7803031e48"/><file name="noconflict.js" hash="e2060c4e5e5955c824723b13a212d3ec"/><file name="office_pickup.js" hash="d02e878c2bd3b2f2ed518e3d04ca04dc"/></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="bg_BG"><file name="speedyTranslate.csv" hash="57b741661de15bc115810ab0bfcba3e2"/></dir></target></contents>
16
  <compatible/>
17
  <dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php><package><name>Mage_Core_Modules</name><channel>community</channel><min>1.7.0.2</min><max>1.8.0.0</max></package><extension><name>soap</name><min></min><max></max></extension></required></dependencies>
18
  </package>
skin/adminhtml/default/default/speedy/js/validateAddress.js CHANGED
@@ -6,6 +6,8 @@ var shippingStreet;
6
  var shippingOffice;
7
  var shippingBlok;
8
 
 
 
9
 
10
  $j(document).ready(function(evt){
11
 
@@ -57,7 +59,7 @@ $j(document).ready(function(evt){
57
  var isValid = 0;
58
 
59
  if (quarter || (quarter_id !="0" && quarter_id !="")) {
60
- if ((street || street_id && number) || blockNo) {
61
  isValid = 1;
62
  }
63
 
6
  var shippingOffice;
7
  var shippingBlok;
8
 
9
+ var isFirstPageLoad = 0;
10
+
11
 
12
  $j(document).ready(function(evt){
13
 
59
  var isValid = 0;
60
 
61
  if (quarter || (quarter_id !="0" && quarter_id !="")) {
62
+ if ((street && number || street_id && number) || blockNo) {
63
  isValid = 1;
64
  }
65
 
skin/frontend/base/default/speedy/js/office_pickup.js CHANGED
@@ -151,12 +151,18 @@ $j('document').ready(function() {
151
  price = priceWithoutTax;
152
  }
153
  else if (showBoth) {
154
- price = priceWithoutTax + '/' + priceWithTax;
155
  }
156
  } else {
157
  price = '0.00';
158
  }
159
- price += ' лв.';
 
 
 
 
 
 
160
  $j('p#fixed_price_view').show().text('Надбавка "Фиксиран час":' + price)
161
 
162
  } else {
@@ -191,19 +197,23 @@ $j('document').ready(function() {
191
  var priceWithTax = $j(finalSelector).find('input:hidden.speedy_exacthour_allowed').val()
192
 
193
  var priceWithoutTax = $j(finalSelector).find('input:hidden.speedy_exacthour_withouttax').val()
194
- var price = '0.00';
195
  if (!isFreeMethod.length) {
196
  if (includeTax) {
197
  price = priceWithTax;
198
  }
199
  else if (excludeTax) {
200
- price = '/' + priceWithoutTax;
201
  }
202
  else if (showBoth) {
203
- price = priceWithoutTax + '/' + priceWithTax;
204
  }
205
  }
206
- price += ' лв.';
 
 
 
 
207
  $j('p#fixed_price_view').show().text('Надбавка "Фиксиран час":' + price)
208
  $j('#speedy_exact_picking_data input:text').removeAttr('disabled')
209
  } else {
151
  price = priceWithoutTax;
152
  }
153
  else if (showBoth) {
154
+ price += priceWithoutTax+' лв. (Вкл. данък: '+priceWithTax;
155
  }
156
  } else {
157
  price = '0.00';
158
  }
159
+
160
+ if(showBoth){
161
+ price += ' лв.'+')'
162
+ }else{
163
+ price += ' лв.';
164
+ }
165
+
166
  $j('p#fixed_price_view').show().text('Надбавка "Фиксиран час":' + price)
167
 
168
  } else {
197
  var priceWithTax = $j(finalSelector).find('input:hidden.speedy_exacthour_allowed').val()
198
 
199
  var priceWithoutTax = $j(finalSelector).find('input:hidden.speedy_exacthour_withouttax').val()
200
+ var price = '';
201
  if (!isFreeMethod.length) {
202
  if (includeTax) {
203
  price = priceWithTax;
204
  }
205
  else if (excludeTax) {
206
+ price += priceWithoutTax;
207
  }
208
  else if (showBoth) {
209
+ price += priceWithoutTax+' лв. (Вкл. данък: '+priceWithTax;
210
  }
211
  }
212
+ if(showBoth){
213
+ price += ' лв.'+')'
214
+ }else{
215
+ price += ' лв.';
216
+ }
217
  $j('p#fixed_price_view').show().text('Надбавка "Фиксиран час":' + price)
218
  $j('#speedy_exact_picking_data input:text').removeAttr('disabled')
219
  } else {