pitneybowes_gsp - Version 1.2.0

Version Notes

Patch release for Magento Connect.

1. Add config option to override domestic shipping address with PB HUB address. When active the PB domestic HUB address will overwrite the customer shipping address for the order. The customer shipping address is stored with PB and also added to the order details for record keeping.

2. move the product weight value into the COMMODITY_WEIGHT column on the CSV catalog exports.

3. add logic to separate free shipping and tax. Now each work independently of one another where before enabling free shipping also made tax 0.00

Download this release

Release Info

Developer Raymond Lai
Extension pitneybowes_gsp
Version 1.2.0
Comparing to
See all releases


Code changes from version 1.1.2 to 1.2.0

Files changed (48) hide show
  1. ReadMe.txt +9 -0
  2. app/code/local/Pb/Pbgsp/Block/Adminhtml/Sales/Order/Invoice/Totals.php +2 -2
  3. app/code/local/Pb/Pbgsp/Block/Adminhtml/Sales/Order/Totals.php +2 -2
  4. app/code/local/Pb/Pbgsp/Block/Checkout/Shipping/Method/Available.php +2 -2
  5. app/code/local/Pb/Pbgsp/Block/Form.php +2 -2
  6. app/code/local/Pb/Pbgsp/Block/Sales/Order/Invoice/Totals.php +2 -2
  7. app/code/local/Pb/Pbgsp/Block/Sales/Order/Totals.php +2 -2
  8. app/code/local/Pb/Pbgsp/Model/Api.php +2 -2
  9. app/code/local/Pb/Pbgsp/Model/Carrier/ShippingMethod.php +3 -3
  10. app/code/local/Pb/Pbgsp/Model/Catalog/Category.php +2 -2
  11. app/code/local/Pb/Pbgsp/Model/Catalog/Cron.php +2 -2
  12. app/code/local/Pb/Pbgsp/Model/Catalog/File.php +4 -4
  13. app/code/local/Pb/Pbgsp/Model/Catalog/Product.php +16 -11
  14. app/code/local/Pb/Pbgsp/Model/Credentials.php +5 -2
  15. app/code/local/Pb/Pbgsp/Model/Creditmemo/Duty.php +2 -2
  16. app/code/local/Pb/Pbgsp/Model/Handlingoptions.php +2 -2
  17. app/code/local/Pb/Pbgsp/Model/Helper.php +2 -2
  18. app/code/local/Pb/Pbgsp/Model/Inboundparcel.php +2 -2
  19. app/code/local/Pb/Pbgsp/Model/Invoice/Duty.php +2 -2
  20. app/code/local/Pb/Pbgsp/Model/Messages.php +2 -2
  21. app/code/local/Pb/Pbgsp/Model/Mysql4/Inboundparcel.php +2 -2
  22. app/code/local/Pb/Pbgsp/Model/Mysql4/Inboundparcel/Collection.php +2 -2
  23. app/code/local/Pb/Pbgsp/Model/Mysql4/Ordernumber.php +2 -2
  24. app/code/local/Pb/Pbgsp/Model/Mysql4/Ordernumber/Collection.php +2 -2
  25. app/code/local/Pb/Pbgsp/Model/Mysql4/Variable.php +2 -2
  26. app/code/local/Pb/Pbgsp/Model/Mysql4/Variable/Collection.php +2 -2
  27. app/code/local/Pb/Pbgsp/Model/Observer.php +31 -7
  28. app/code/local/Pb/Pbgsp/Model/Ordernumber.php +2 -2
  29. app/code/local/Pb/Pbgsp/Model/Pdf/Tax.php +2 -2
  30. app/code/local/Pb/Pbgsp/Model/Quote/Duty.php +2 -2
  31. app/code/local/Pb/Pbgsp/Model/Resource/Mysql4/Setup.php +2 -2
  32. app/code/local/Pb/Pbgsp/Model/Sales/Order/Shipment.php +2 -2
  33. app/code/local/Pb/Pbgsp/Model/System/Config/Backend/Serialized/Array/Priority.php +46 -0
  34. app/code/local/Pb/Pbgsp/Model/System/Config/Source/Asn.php +15 -0
  35. app/code/local/Pb/Pbgsp/Model/System/Config/Source/Auth.php +15 -0
  36. app/code/local/Pb/Pbgsp/Model/System/Config/Source/Checkout.php +15 -0
  37. app/code/local/Pb/Pbgsp/Model/System/Config/Source/Sftp.php +15 -0
  38. app/code/local/Pb/Pbgsp/Model/Util.php +2 -2
  39. app/code/local/Pb/Pbgsp/Model/Variable.php +2 -2
  40. app/code/local/Pb/Pbgsp/data/pb_pbgsp_setup/data-install-1.0.0.php +2 -2
  41. app/code/local/Pb/Pbgsp/etc/config.xml +9 -4
  42. app/code/local/Pb/Pbgsp/etc/system.xml +452 -446
  43. app/code/local/Pb/Pbgsp/etc/system.xml_bk +453 -0
  44. app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php +2 -2
  45. app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.0.0-1.0.1.php +2 -2
  46. app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.1.1-1.1.2.php +5 -5
  47. app/locale/en_US/template/email/pbgsp_shipment_new.html +13 -6
  48. package.xml +8 -6
ReadMe.txt CHANGED
@@ -32,6 +32,15 @@ In order to take advantage of the file encryption setting in the extension confi
32
  CHANGELOG
33
  ========================================================
34
 
 
 
 
 
 
 
 
 
 
35
  v. 1.1.2
36
 
37
  Integrated validation for title field in configuration page to resolve PHP 5.3 will warning when there is an empty string
32
  CHANGELOG
33
  ========================================================
34
 
35
+ v. 1.2.0
36
+
37
+ Add config option to override domestic shipping address with PB HUB address. When active the PB domestic HUB address will overwrite the customer shipping address for the order. The customer shipping address is stored with PB and also added to the order details for record keeping.
38
+
39
+ move the product weight value into the COMMODITY_WEIGHT column on the CSV catalog exports.
40
+
41
+ add logic to separate free shipping and tax. Now each work independently of one another where before enabling free shipping also made tax 0.00
42
+
43
+
44
  v. 1.1.2
45
 
46
  Integrated validation for title field in configuration page to resolve PHP 5.3 will warning when there is an empty string
app/code/local/Pb/Pbgsp/Block/Adminhtml/Sales/Order/Invoice/Totals.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
 
3
  /**
4
- * Product: Pb_Pbgsp (1.1.2)
5
- * Packaged: 2015-09-23T12:09:53+00:00
6
  * Last Modified: 2015-09-14T12:11:20+00:00
7
 
8
 
1
  <?php
2
 
3
  /**
4
+ * Product: Pb_Pbgsp (1.2.0)
5
+ * Packaged: 2015-10-01T12:11:15+00:00
6
  * Last Modified: 2015-09-14T12:11:20+00:00
7
 
8
 
app/code/local/Pb/Pbgsp/Block/Adminhtml/Sales/Order/Totals.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
 
3
  /**
4
- * Product: Pb_Pbgsp (1.1.2)
5
- * Packaged: 2015-09-23T12:09:53+00:00
6
  * Last Modified: 2015-09-14T12:11:20+00:00
7
 
8
 
1
  <?php
2
 
3
  /**
4
+ * Product: Pb_Pbgsp (1.2.0)
5
+ * Packaged: 2015-10-01T12:11:15+00:00
6
  * Last Modified: 2015-09-14T12:11:20+00:00
7
 
8
 
app/code/local/Pb/Pbgsp/Block/Checkout/Shipping/Method/Available.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
 
3
  /**
4
- * Product: Pb_Pbgsp (1.1.2)
5
- * Packaged: 2015-09-23T12:09:53+00:00
6
  * Last Modified: 2015-09-14T12:11:20+00:00
7
 
8
 
1
  <?php
2
 
3
  /**
4
+ * Product: Pb_Pbgsp (1.2.0)
5
+ * Packaged: 2015-10-01T12:11:15+00:00
6
  * Last Modified: 2015-09-14T12:11:20+00:00
7
 
8
 
app/code/local/Pb/Pbgsp/Block/Form.php CHANGED
@@ -1,7 +1,7 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.1.2)
4
- * Packaged: 2015-09-23T12:09:53+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.2.0)
4
+ * Packaged: 2015-10-01T12:11:15+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
app/code/local/Pb/Pbgsp/Block/Sales/Order/Invoice/Totals.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
 
3
  /**
4
- * Product: Pb_Pbgsp (1.1.2)
5
- * Packaged: 2015-09-23T12:09:53+00:00
6
  * Last Modified: 2015-09-14T12:11:20+00:00
7
 
8
 
1
  <?php
2
 
3
  /**
4
+ * Product: Pb_Pbgsp (1.2.0)
5
+ * Packaged: 2015-10-01T12:11:15+00:00
6
  * Last Modified: 2015-09-14T12:11:20+00:00
7
 
8
 
app/code/local/Pb/Pbgsp/Block/Sales/Order/Totals.php CHANGED
@@ -1,7 +1,7 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.1.2)
4
- * Packaged: 2015-09-23T12:09:53+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.2.0)
4
+ * Packaged: 2015-10-01T12:11:15+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
app/code/local/Pb/Pbgsp/Model/Api.php CHANGED
@@ -1,7 +1,7 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.1.2)
4
- * Packaged: 2015-09-23T12:09:53+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.2.0)
4
+ * Packaged: 2015-10-01T12:11:15+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
app/code/local/Pb/Pbgsp/Model/Carrier/ShippingMethod.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
 
3
  /**
4
- * Product: Pb_Pbgsp (1.1.2)
5
- * Packaged: 2015-09-23T12:09:53+00:00
6
  * Last Modified: 2015-09-14T12:11:20+00:00
7
 
8
 
@@ -266,7 +266,7 @@ class Pb_Pbgsp_Model_Carrier_ShippingMethod extends Mage_Shipping_Model_Carrier_
266
  $method = $this->_getCheapestShipMethod($quoteSet,$items);
267
  $method->setCost(0);
268
  $method->setPrice(0);
269
- $method->setTax(0);
270
  $result->append($method);
271
  array_push($shipMethods,$method);
272
  break;
1
  <?php
2
 
3
  /**
4
+ * Product: Pb_Pbgsp (1.2.0)
5
+ * Packaged: 2015-10-01T12:11:15+00:00
6
  * Last Modified: 2015-09-14T12:11:20+00:00
7
 
8
 
266
  $method = $this->_getCheapestShipMethod($quoteSet,$items);
267
  $method->setCost(0);
268
  $method->setPrice(0);
269
+ //$method->setTax(0); //tax should be included in free shipping
270
  $result->append($method);
271
  array_push($shipMethods,$method);
272
  break;
app/code/local/Pb/Pbgsp/Model/Catalog/Category.php CHANGED
@@ -1,7 +1,7 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.1.2)
4
- * Packaged: 2015-09-23T12:09:53+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.2.0)
4
+ * Packaged: 2015-10-01T12:11:15+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
app/code/local/Pb/Pbgsp/Model/Catalog/Cron.php CHANGED
@@ -1,7 +1,7 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.1.2)
4
- * Packaged: 2015-09-23T12:09:53+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.2.0)
4
+ * Packaged: 2015-10-01T12:11:15+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
app/code/local/Pb/Pbgsp/Model/Catalog/File.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
 
3
  /**
4
- * Product: Pb_Pbgsp (1.1.2)
5
- * Packaged: 2015-09-23T12:09:53+00:00
6
  * Last Modified: 2015-09-14T12:11:20+00:00
7
 
8
 
@@ -60,10 +60,10 @@ class Pb_Pbgsp_Model_Catalog_File {
60
  'RH_CATEGORY_ID','STANDARD_PRICE','WEIGHT_UNIT','DISTANCE_UNIT','COO','IMAGE_URL','PARENT_SKU',
61
  'CHILD_SKU','PARCELS_PER_SKU','UPC','UPC_CHECK_DIGIT','GTIN','MPN','ISBN','BRAND','MANUFACTURER',
62
  'MODEL_NUMBER','MANUFACTURER_STOCK_NUMBER','COMMODITY_CONDITION','COMMODITY_HEIGHT',
63
- 'COMMODITY_WIDTH','COMMODITY_LENGTH','PACKAGE_WEIGHT','PACKAGE_HEIGHT','PACKAGE_WIDTH',
64
  'PACKAGE_LENGTH','HAZMAT','ORMD','CHEMICAL_INDICATOR','PESTICIDE_INDICATOR','AEROSOL_INDICATOR',
65
  'RPPC_INDICATOR','BATTERY_TYPE','NON_SPILLABLE_BATTERY','FUEL_RESTRICTION','SHIP_ALONE',
66
- 'RH_CATEGORY_ID_PATH','RH_CATEGORY_NAME_PATH'));//,'RH_CATEGORY_URL_PATH','GPC','COMMODITY_WEIGHT','HS_CODE','CURRENCY'
67
 
68
  fflush($this->file);
69
  }
1
  <?php
2
 
3
  /**
4
+ * Product: Pb_Pbgsp (1.2.0)
5
+ * Packaged: 2015-10-01T12:11:15+00:00
6
  * Last Modified: 2015-09-14T12:11:20+00:00
7
 
8
 
60
  'RH_CATEGORY_ID','STANDARD_PRICE','WEIGHT_UNIT','DISTANCE_UNIT','COO','IMAGE_URL','PARENT_SKU',
61
  'CHILD_SKU','PARCELS_PER_SKU','UPC','UPC_CHECK_DIGIT','GTIN','MPN','ISBN','BRAND','MANUFACTURER',
62
  'MODEL_NUMBER','MANUFACTURER_STOCK_NUMBER','COMMODITY_CONDITION','COMMODITY_HEIGHT',
63
+ 'COMMODITY_WIDTH','COMMODITY_LENGTH','PACKAGE_HEIGHT','PACKAGE_WIDTH',
64
  'PACKAGE_LENGTH','HAZMAT','ORMD','CHEMICAL_INDICATOR','PESTICIDE_INDICATOR','AEROSOL_INDICATOR',
65
  'RPPC_INDICATOR','BATTERY_TYPE','NON_SPILLABLE_BATTERY','FUEL_RESTRICTION','SHIP_ALONE',
66
+ 'RH_CATEGORY_ID_PATH','RH_CATEGORY_NAME_PATH','COMMODITY_WEIGHT'));//,'RH_CATEGORY_URL_PATH','GPC','COMMODITY_WEIGHT','HS_CODE','CURRENCY'
67
 
68
  fflush($this->file);
69
  }
app/code/local/Pb/Pbgsp/Model/Catalog/Product.php CHANGED
@@ -1,7 +1,7 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.1.2)
4
- * Packaged: 2015-09-23T12:09:53+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
@@ -122,6 +122,7 @@ class Pb_Pbgsp_Model_Catalog_Product {
122
  public function writeToFile($file,$categoryCode,$parentSku,$category) {
123
  /** $categoryCode is passed in method because we don't have categoryCode for child products. BigPixel 6/11/2012 */
124
  $name = Pb_Pbgsp_Model_Catalog_File::stripHtml($this -> getName());
 
125
  $name = preg_replace("/[^A-Za-z0-9 ,.\-\+=;:\\(){}\[\]@?%$#]/", '', $name);
126
  $string = "<Commodity>\n";
127
  $string .= "<CategoryCode><![CDATA[" . htmlentities($categoryCode) . "]]></CategoryCode>\n";
@@ -129,14 +130,14 @@ class Pb_Pbgsp_Model_Catalog_Product {
129
  $string .= "<Name><![CDATA[" . htmlentities($name) . "]]></Name>\n";
130
  $string .= "<CountryOfOrigin><![CDATA[" . htmlentities(preg_replace("/[^A-Za-z0-9]/",'',$this -> getCountryOfOrigin())) . "]]></CountryOfOrigin>\n"; //added by kamran,1/14/2012
131
  $description = Pb_Pbgsp_Model_Catalog_File::stripHtml($this -> getDescription());
132
- $description = preg_replace("/[^A-Za-z0-9 ,.\-\+=;:\\(){}\[\]@?%$#]/", '', $description);
133
  if (strlen($description) >= 2000) {
134
 
135
  $description = $this -> chopString($description, 1999);
136
  }
137
 
138
- $shortDescription = Pb_Pbgsp_Model_Catalog_File::stripHtml($this -> getShortDescription());
139
- $shortDescription = preg_replace("/[^A-Za-z0-9 ,.\-\+=;:\\(){}\[\]@?%$#]/", '', $shortDescription);
140
  if (strlen($shortDescription) >= 2000) {
141
 
142
  $shortDescription = $this -> chopString($shortDescription, 1999);
@@ -159,15 +160,19 @@ class Pb_Pbgsp_Model_Catalog_Product {
159
  // 'RH_CATEGORY_ID_PATH','RH_CATEGORY_NAME_PATH','RH_CATEGORY_URL_PATH','GPC','COMMODITY_WEIGHT',
160
  // 'HS_CODE','CURRENCY'));
161
  $merchantCode = Pb_Pbgsp_Model_Credentials::getMerchantCode();
162
- fputcsv($file,array($this -> getSKU(),$name,$shortDescription,
163
- $description,$merchantCode,$this -> getURL(),$merchantCode,'',
164
- $categoryCode,$this->getPrice(),'lb','',$this->getCountryOfOrigin(),'','',
 
 
 
 
165
  '','','','','','','','','',
166
  '','','','',
167
- '','',$this -> getWeight(),'','',
168
- '','','','','','',
169
  '','','','','',
170
- strval($category->getData('id_path')),$category->getData('name_path')
 
 
171
  //,'','','','',$category->getData('store')->getCurrentCurrencyCode()
172
  ));
173
  //fwrite($file, $string);
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.2.0)
4
+ * Packaged: 2015-10-01T12:11:15+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
122
  public function writeToFile($file,$categoryCode,$parentSku,$category) {
123
  /** $categoryCode is passed in method because we don't have categoryCode for child products. BigPixel 6/11/2012 */
124
  $name = Pb_Pbgsp_Model_Catalog_File::stripHtml($this -> getName());
125
+ $shortDescription ='';
126
  $name = preg_replace("/[^A-Za-z0-9 ,.\-\+=;:\\(){}\[\]@?%$#]/", '', $name);
127
  $string = "<Commodity>\n";
128
  $string .= "<CategoryCode><![CDATA[" . htmlentities($categoryCode) . "]]></CategoryCode>\n";
130
  $string .= "<Name><![CDATA[" . htmlentities($name) . "]]></Name>\n";
131
  $string .= "<CountryOfOrigin><![CDATA[" . htmlentities(preg_replace("/[^A-Za-z0-9]/",'',$this -> getCountryOfOrigin())) . "]]></CountryOfOrigin>\n"; //added by kamran,1/14/2012
132
  $description = Pb_Pbgsp_Model_Catalog_File::stripHtml($this -> getDescription());
133
+ $description = preg_replace("/[^A-Za-z0-9 .\-\+=;:\\(){}\[\]@?%$#]/", '', $description);
134
  if (strlen($description) >= 2000) {
135
 
136
  $description = $this -> chopString($description, 1999);
137
  }
138
 
139
+ $shortDescription = Pb_Pbgsp_Model_Catalog_File::stripHtml($this -> getShortDescription());
140
+ $shortDescription = preg_replace("/[^A-Za-z0-9 .\-\+=;:\\(){}\[\]@?%$#]/",'',$shortDescription);
141
  if (strlen($shortDescription) >= 2000) {
142
 
143
  $shortDescription = $this -> chopString($shortDescription, 1999);
160
  // 'RH_CATEGORY_ID_PATH','RH_CATEGORY_NAME_PATH','RH_CATEGORY_URL_PATH','GPC','COMMODITY_WEIGHT',
161
  // 'HS_CODE','CURRENCY'));
162
  $merchantCode = Pb_Pbgsp_Model_Credentials::getMerchantCode();
163
+ if($this -> getWeight() == 0)
164
+ {
165
+ $weight = '';
166
+ }else{
167
+ $weight = $this -> getWeight();
168
+ }
169
+ fputcsv($file,array($this -> getSKU(),$name,$shortDescription,$description,$merchantCode,$this -> getURL(),$merchantCode,'',$categoryCode,$this->getPrice(),'lb','',$this->getCountryOfOrigin(),'','',
170
  '','','','','','','','','',
171
  '','','','',
 
 
172
  '','','','','',
173
+ '','','','','','',
174
+ '','','','',
175
+ strval($category->getData('id_path')),$category->getData('name_path'),$weight
176
  //,'','','','',$category->getData('store')->getCurrentCurrencyCode()
177
  ));
178
  //fwrite($file, $string);
app/code/local/Pb/Pbgsp/Model/Credentials.php CHANGED
@@ -1,7 +1,7 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.1.2)
4
- * Packaged: 2015-09-23T12:09:53+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
@@ -51,6 +51,9 @@ class Pb_Pbgsp_Model_Credentials {
51
  }
52
  public static function isASNGenerationEnabled() {
53
  return Mage::getStoreConfig('carriers/pbgsp/asn_generation_enabled');
 
 
 
54
  }
55
  public static function isFreeTaxEnabled() {
56
  return Mage::getStoreConfig('carriers/pbgsp/free_tax_enable');
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.2.0)
4
+ * Packaged: 2015-10-01T12:11:15+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
51
  }
52
  public static function isASNGenerationEnabled() {
53
  return Mage::getStoreConfig('carriers/pbgsp/asn_generation_enabled');
54
+ }
55
+ public static function isOverrideShippingAddressEnabled() {
56
+ return Mage::getStoreConfig('carriers/pbgsp/override_shipping_address_enabled');
57
  }
58
  public static function isFreeTaxEnabled() {
59
  return Mage::getStoreConfig('carriers/pbgsp/free_tax_enable');
app/code/local/Pb/Pbgsp/Model/Creditmemo/Duty.php CHANGED
@@ -1,7 +1,7 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.1.2)
4
- * Packaged: 2015-09-23T12:09:53+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.2.0)
4
+ * Packaged: 2015-10-01T12:11:15+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
app/code/local/Pb/Pbgsp/Model/Handlingoptions.php CHANGED
@@ -1,7 +1,7 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.1.2)
4
- * Packaged: 2015-09-23T12:09:53+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.2.0)
4
+ * Packaged: 2015-10-01T12:11:15+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
app/code/local/Pb/Pbgsp/Model/Helper.php CHANGED
@@ -1,7 +1,7 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.1.2)
4
- * Packaged: 2015-09-23T12:09:53+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.2.0)
4
+ * Packaged: 2015-10-01T12:11:15+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
app/code/local/Pb/Pbgsp/Model/Inboundparcel.php CHANGED
@@ -1,7 +1,7 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.1.2)
4
- * Packaged: 2015-09-23T12:09:53+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.2.0)
4
+ * Packaged: 2015-10-01T12:11:15+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
app/code/local/Pb/Pbgsp/Model/Invoice/Duty.php CHANGED
@@ -1,7 +1,7 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.1.2)
4
- * Packaged: 2015-09-23T12:09:53+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.2.0)
4
+ * Packaged: 2015-10-01T12:11:15+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
app/code/local/Pb/Pbgsp/Model/Messages.php CHANGED
@@ -1,7 +1,7 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.1.2)
4
- * Packaged: 2015-09-23T12:09:53+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.2.0)
4
+ * Packaged: 2015-10-01T12:11:15+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
app/code/local/Pb/Pbgsp/Model/Mysql4/Inboundparcel.php CHANGED
@@ -1,7 +1,7 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.1.2)
4
- * Packaged: 2015-09-23T12:09:53+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.2.0)
4
+ * Packaged: 2015-10-01T12:11:15+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
app/code/local/Pb/Pbgsp/Model/Mysql4/Inboundparcel/Collection.php CHANGED
@@ -1,7 +1,7 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.1.2)
4
- * Packaged: 2015-09-23T12:09:53+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.2.0)
4
+ * Packaged: 2015-10-01T12:11:15+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
app/code/local/Pb/Pbgsp/Model/Mysql4/Ordernumber.php CHANGED
@@ -1,7 +1,7 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.1.2)
4
- * Packaged: 2015-09-23T12:09:53+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.2.0)
4
+ * Packaged: 2015-10-01T12:11:15+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
app/code/local/Pb/Pbgsp/Model/Mysql4/Ordernumber/Collection.php CHANGED
@@ -1,7 +1,7 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.1.2)
4
- * Packaged: 2015-09-23T12:09:53+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.2.0)
4
+ * Packaged: 2015-10-01T12:11:15+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
app/code/local/Pb/Pbgsp/Model/Mysql4/Variable.php CHANGED
@@ -1,7 +1,7 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.1.2)
4
- * Packaged: 2015-09-23T12:09:53+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.2.0)
4
+ * Packaged: 2015-10-01T12:11:15+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
app/code/local/Pb/Pbgsp/Model/Mysql4/Variable/Collection.php CHANGED
@@ -1,7 +1,7 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.1.2)
4
- * Packaged: 2015-09-23T12:09:53+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.2.0)
4
+ * Packaged: 2015-10-01T12:11:15+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
app/code/local/Pb/Pbgsp/Model/Observer.php CHANGED
@@ -1,11 +1,10 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.1.2)
4
- * Packaged: 2015-09-23T12:09:53+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
8
-
9
  * File: app/code/local/Pb/Pbgsp/Model/Observer.php
10
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
11
  */
@@ -137,6 +136,30 @@ class Pb_Pbgsp_Model_Observer {
137
  $orderNumber->setConfirmed(true);
138
  $orderNumber->setReferenced(true);
139
  $orderNumber->save();
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
140
  Pb_Pbgsp_Model_Util::log(" $mageOrderNumber order is confirmed in PB");
141
  }
142
  // if (Pb_Pbgsp_Model_Api::setOrderReference($cpOrderNumber,$mageOrderNumber)) {
@@ -183,6 +206,7 @@ class Pb_Pbgsp_Model_Observer {
183
  //Pb_Pbgsp_Model_Util::log('Pb_Pbgsp_Model_Observer.saveShippingMethod');
184
  //TODO: If anything fails here I need to fail the checkout process.
185
  $address = $observer->getQuote()->getShippingAddress();
 
186
  if ($this->isPbOrder($address)) {
187
  Pb_Pbgsp_Model_Util::log(" PB order");
188
  $items = Mage::getSingleton('checkout/cart')->getItems();
@@ -215,6 +239,7 @@ class Pb_Pbgsp_Model_Observer {
215
  $orderNumber->setHubCountry($order["shipToHub"]['hubAddress']['country']);
216
  $orderNumber->setHubPostalCode($order["shipToHub"]['hubAddress']['postalOrZipCode']);
217
  $orderNumber->setHubCity($order["shipToHub"]['hubAddress']['city']);
 
218
  Mage::getSingleton("customer/session")->setPbOrderNumber($orderNumber);
219
  } else {
220
  Pb_Pbgsp_Model_Util::log(" not clearpath order");
@@ -282,8 +307,10 @@ class Pb_Pbgsp_Model_Observer {
282
  <span>".$cpOrderNumber->getHubProvinceOrState()."</span><br/>
283
  <strong>Hub City</strong>
284
  <span>".$cpOrderNumber->getHubCity()."</span><br/>
285
- <strong>Hub Country</strong>
286
  <span>".$cpOrderNumber->getHubCountry()."</span><br/>
 
 
287
  </fieldset>
288
  </div>";
289
  $transport['html'] = $transport['html'] . $html;
@@ -301,9 +328,7 @@ class Pb_Pbgsp_Model_Observer {
301
  $staging = 0;
302
  if(strpos(Pb_Pbgsp_Model_Credentials::getCheckoutUrl(),'cpsandbox'))
303
  $staging = 1;
304
-
305
 
306
-
307
 
308
  $transport['html'] = "<a href='http://tracking.ecommerce.pb.com/track/$cpord?staging=$staging'>Track your order</a>";
309
  }
@@ -336,7 +361,6 @@ class Pb_Pbgsp_Model_Observer {
336
  $staging = 0;
337
  if(strpos(Pb_Pbgsp_Model_Credentials::getCheckoutUrl(),'cpsandbox'))
338
  $staging = 1;
339
-
340
 
341
  $script = "<script lang='javascript'>
342
  window.location = 'http://tracking.ecommerce.pb.com/track/$cpord?staging=$staging';
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.2.0)
4
+ * Packaged: 2015-10-01T12:11:15+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
 
8
  * File: app/code/local/Pb/Pbgsp/Model/Observer.php
9
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
10
  */
136
  $orderNumber->setConfirmed(true);
137
  $orderNumber->setReferenced(true);
138
  $orderNumber->save();
139
+
140
+ /* Update order shipping address in Magento
141
+ Added by: Sudarshan
142
+ Date: 25/09/2015
143
+
144
+ */
145
+ if(Pb_Pbgsp_Model_Credentials::isOverrideShippingAddressEnabled() == '1') {
146
+ try{
147
+ $shippingAddress = Mage::getModel('sales/order_address')->load($order->getShippingAddress()->getId());
148
+
149
+ $shippingAddress
150
+ ->setStreet(array($orderNumber->getHubStreet1(),$orderNumber->getHubStreet2()))
151
+ ->setCity($orderNumber->getHubCity())
152
+ ->setCountry_id($orderNumber->getHubCountry())
153
+ ->setRegion($orderNumber->getHubProvinceOrState())
154
+ ->setPostcode($orderNumber->getHubPostalCode())->save();
155
+ }
156
+ catch(Exception $e) {
157
+ Pb_Pbgsp_Model_Util::log("Error updating shipping address in magento");
158
+ Pb_Pbgsp_Model_Util::logException($e);
159
+ }
160
+
161
+ }
162
+
163
  Pb_Pbgsp_Model_Util::log(" $mageOrderNumber order is confirmed in PB");
164
  }
165
  // if (Pb_Pbgsp_Model_Api::setOrderReference($cpOrderNumber,$mageOrderNumber)) {
206
  //Pb_Pbgsp_Model_Util::log('Pb_Pbgsp_Model_Observer.saveShippingMethod');
207
  //TODO: If anything fails here I need to fail the checkout process.
208
  $address = $observer->getQuote()->getShippingAddress();
209
+ $domesticShippingAdress = $address->getName()."</br>".$address->getStreetFull().", ".$address->getCity()."</br> ".$address->getRegion().", ".$address->getCountry().",".$address->getPostcode()."</br> T:".$address->getTelephone();
210
  if ($this->isPbOrder($address)) {
211
  Pb_Pbgsp_Model_Util::log(" PB order");
212
  $items = Mage::getSingleton('checkout/cart')->getItems();
239
  $orderNumber->setHubCountry($order["shipToHub"]['hubAddress']['country']);
240
  $orderNumber->setHubPostalCode($order["shipToHub"]['hubAddress']['postalOrZipCode']);
241
  $orderNumber->setHubCity($order["shipToHub"]['hubAddress']['city']);
242
+ $orderNumber->setOriginalShippingAddress($domesticShippingAdress);
243
  Mage::getSingleton("customer/session")->setPbOrderNumber($orderNumber);
244
  } else {
245
  Pb_Pbgsp_Model_Util::log(" not clearpath order");
307
  <span>".$cpOrderNumber->getHubProvinceOrState()."</span><br/>
308
  <strong>Hub City</strong>
309
  <span>".$cpOrderNumber->getHubCity()."</span><br/>
310
+ <strong>Hub Country</strong>
311
  <span>".$cpOrderNumber->getHubCountry()."</span><br/>
312
+ <strong>Original Shiiping Address</strong>
313
+ <span>".$cpOrderNumber->getOriginalShippingAddress()."</span><br/>
314
  </fieldset>
315
  </div>";
316
  $transport['html'] = $transport['html'] . $html;
328
  $staging = 0;
329
  if(strpos(Pb_Pbgsp_Model_Credentials::getCheckoutUrl(),'cpsandbox'))
330
  $staging = 1;
 
331
 
 
332
 
333
  $transport['html'] = "<a href='http://tracking.ecommerce.pb.com/track/$cpord?staging=$staging'>Track your order</a>";
334
  }
361
  $staging = 0;
362
  if(strpos(Pb_Pbgsp_Model_Credentials::getCheckoutUrl(),'cpsandbox'))
363
  $staging = 1;
 
364
 
365
  $script = "<script lang='javascript'>
366
  window.location = 'http://tracking.ecommerce.pb.com/track/$cpord?staging=$staging';
app/code/local/Pb/Pbgsp/Model/Ordernumber.php CHANGED
@@ -1,7 +1,7 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.1.2)
4
- * Packaged: 2015-09-23T12:09:53+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.2.0)
4
+ * Packaged: 2015-10-01T12:11:15+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
app/code/local/Pb/Pbgsp/Model/Pdf/Tax.php CHANGED
@@ -1,7 +1,7 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.1.2)
4
- * Packaged: 2015-09-23T12:09:53+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.2.0)
4
+ * Packaged: 2015-10-01T12:11:15+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
app/code/local/Pb/Pbgsp/Model/Quote/Duty.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
 
3
  /**
4
- * Product: Pb_Pbgsp (1.1.2)
5
- * Packaged: 2015-09-23T12:09:53+00:00
6
  * Last Modified: 2015-09-14T12:11:20+00:00
7
 
8
 
1
  <?php
2
 
3
  /**
4
+ * Product: Pb_Pbgsp (1.2.0)
5
+ * Packaged: 2015-10-01T12:11:15+00:00
6
  * Last Modified: 2015-09-14T12:11:20+00:00
7
 
8
 
app/code/local/Pb/Pbgsp/Model/Resource/Mysql4/Setup.php CHANGED
@@ -1,7 +1,7 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.1.2)
4
- * Packaged: 2015-09-23T12:09:53+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.2.0)
4
+ * Packaged: 2015-10-01T12:11:15+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
app/code/local/Pb/Pbgsp/Model/Sales/Order/Shipment.php CHANGED
@@ -1,7 +1,7 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.1.2)
4
- * Packaged: 2015-09-23T12:09:53+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.2.0)
4
+ * Packaged: 2015-10-01T12:11:15+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
app/code/local/Pb/Pbgsp/Model/System/Config/Backend/Serialized/Array/Priority.php ADDED
@@ -0,0 +1,46 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+
3
+ /**
4
+ * Backend for serialized array data with a priority sorting
5
+ *
6
+ */
7
+ class Vbw_Punchout_Model_System_Config_Backend_Serialized_Array_Priority extends Mage_Adminhtml_Model_System_Config_Backend_Serialized
8
+ {
9
+ /**
10
+ * Unset array element with '__empty' key
11
+ *
12
+ */
13
+ protected function _beforeSave()
14
+ {
15
+ $value = $this->getValue();
16
+ if (is_array($value)) {
17
+ unset($value['__empty']);
18
+ }
19
+ usort($value,array($this,'sortByPriority'));
20
+ $this->setValue($value);
21
+ parent::_beforeSave();
22
+ }
23
+
24
+ /**
25
+ * @param array $a
26
+ * @param array $b
27
+ * @return int
28
+ */
29
+ public function sortByPriority ($a,$b)
30
+ {
31
+ if (is_array($a)
32
+ && is_array($b)) {
33
+ if (isset($a['priority'])
34
+ && isset($b['priority'])
35
+ && $a['priority']!= $b['priority']) {
36
+ if ($a['priority'] > $b['priority']) {
37
+ return 1;
38
+ } else {
39
+ return -1;
40
+ }
41
+ }
42
+ }
43
+ return 0;
44
+ }
45
+
46
+ }
app/code/local/Pb/Pbgsp/Model/System/Config/Source/Asn.php ADDED
@@ -0,0 +1,15 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+
3
+ class pb_pbgsp_model_System_Config_Source_Asn
4
+ {
5
+
6
+ public function toOptionArray()
7
+ {
8
+ return array(
9
+ array('value'=>"https://cbs.ecommerce.pb.com/order-mgmt/services/v1", 'label'=>'Production'),
10
+ array('value'=>"https://op-sandbox-cbs.ecommerce.pb.com/order-mgmt/services/v1", 'label'=>'Sandbox'),
11
+
12
+ );
13
+ }
14
+
15
+ }
app/code/local/Pb/Pbgsp/Model/System/Config/Source/Auth.php ADDED
@@ -0,0 +1,15 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+
3
+ class pb_pbgsp_model_System_Config_Source_Auth
4
+ {
5
+
6
+ public function toOptionArray()
7
+ {
8
+ return array(
9
+ array('value'=>"Auth: https://cbs.ecommerce.pb.com/auth/token", 'label'=>'Production'),
10
+ array('value'=>"https://sandbox-cbs.ecommerce.pb.com/auth/token", 'label'=>'Sandbox'),
11
+
12
+ );
13
+ }
14
+
15
+ }
app/code/local/Pb/Pbgsp/Model/System/Config/Source/Checkout.php ADDED
@@ -0,0 +1,15 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+
3
+ class pb_pbgsp_model_System_Config_Source_Checkout
4
+ {
5
+
6
+ public function toOptionArray()
7
+ {
8
+ return array(
9
+ array('value'=>"https://cbs.ecommerce.pb.com/checkout/services/v1", 'label'=>'Production'),
10
+ array('value'=>"https://sandbox-cbs.ecommerce.pb.com/checkout/services/v1", 'label'=>'Sandbox'),
11
+
12
+ );
13
+ }
14
+
15
+ }
app/code/local/Pb/Pbgsp/Model/System/Config/Source/Sftp.php ADDED
@@ -0,0 +1,15 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+
3
+ class pb_pbgsp_model_System_Config_Source_Sftp
4
+ {
5
+
6
+ public function toOptionArray()
7
+ {
8
+ return array(
9
+ array('value'=>"sftp-cbs.ecommerce.pb.com", 'label'=>'Production'),
10
+ array('value'=>"sftp-sandbox-cbs.ecommerce.pb.com", 'label'=>'Sandbox'),
11
+
12
+ );
13
+ }
14
+
15
+ }
app/code/local/Pb/Pbgsp/Model/Util.php CHANGED
@@ -1,7 +1,7 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.1.2)
4
- * Packaged: 2015-09-23T12:09:53+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.2.0)
4
+ * Packaged: 2015-10-01T12:11:15+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
app/code/local/Pb/Pbgsp/Model/Variable.php CHANGED
@@ -1,7 +1,7 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.1.2)
4
- * Packaged: 2015-09-23T12:09:53+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.2.0)
4
+ * Packaged: 2015-10-01T12:11:15+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
app/code/local/Pb/Pbgsp/data/pb_pbgsp_setup/data-install-1.0.0.php CHANGED
@@ -1,7 +1,7 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.1.2)
4
- * Packaged: 2015-09-23T12:09:53+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.2.0)
4
+ * Packaged: 2015-10-01T12:11:15+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
app/code/local/Pb/Pbgsp/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <Pb_Pbgsp>
5
- <version>1.1.2</version>
6
  </Pb_Pbgsp>
7
  </modules>
8
  <global>
@@ -245,11 +245,16 @@
245
  </p>
246
  <p style="font-size:12px; line-height:16px; margin:0;">
247
  Your shipping confirmation is below. Thank you again for your business.
248
- </p>
249
 
250
- <h2 style="font-size:18px; font-weight:normal; margin:0;">Your Order #{{var order.increment_id}} has been shipped from local warehouse to international shipment hub from where it will be shipped to your country.</h2>
 
 
 
251
 
252
- ]]>
 
 
253
  </custom_shipment_email_template>
254
  <separate_log_file>0</separate_log_file>
255
 
2
  <config>
3
  <modules>
4
  <Pb_Pbgsp>
5
+ <version>1.2.0</version>
6
  </Pb_Pbgsp>
7
  </modules>
8
  <global>
245
  </p>
246
  <p style="font-size:12px; line-height:16px; margin:0;">
247
  Your shipping confirmation is below. Thank you again for your business.
248
+ </p></br>
249
 
250
+ <h4 style="font-size:18px; font-weight:normal; margin:0;">Your Order #{{var order.increment_id}} is being shipped via Pitney Bowes to the following address
251
+ </h4>
252
+ <p>
253
+ {{var order.getShippingAddress().format('html')}} </p>
254
 
255
+ <b><i>Note: The above shipping address is not the final shipping address but it is the distribution hub address that the parcel will be sent out internationally</i></b>
256
+
257
+ ]]>
258
  </custom_shipment_email_template>
259
  <separate_log_file>0</separate_log_file>
260
 
app/code/local/Pb/Pbgsp/etc/system.xml CHANGED
@@ -1,446 +1,452 @@
1
- <?xml version="1.0"?>
2
- <config>
3
- <sections>
4
- <carriers>
5
- <groups>
6
- <pbgsp translate="label" module="shipping">
7
- <label>Pitney Bowes PBGSP</label>
8
- <frontend_type>text</frontend_type>
9
- <sort_order>13</sort_order>
10
- <show_in_default>1</show_in_default>
11
- <show_in_website>1</show_in_website>
12
- <show_in_store>1</show_in_store>
13
- <fields>
14
- <active translate="label">
15
- <label>Enabled</label>
16
- <frontend_type>select</frontend_type>
17
- <source_model>adminhtml/system_config_source_yesno</source_model>
18
- <sort_order>1</sort_order>
19
- <show_in_default>1</show_in_default>
20
- <show_in_website>1</show_in_website>
21
- <show_in_store>1</show_in_store>
22
- </active>
23
- <merchantcode translate="label">
24
- <label>Merchant Code</label>
25
- <frontend_type>text</frontend_type>
26
- <backend_model>adminhtml/system_config_backend_encrypted</backend_model>
27
- <sort_order>10</sort_order>
28
- <show_in_default>1</show_in_default>
29
- <show_in_website>1</show_in_website>
30
- <show_in_store>1</show_in_store>
31
- </merchantcode>
32
- <authorization_endpoint translate="label">
33
- <label>Authorization Endpoint</label>
34
- <!-- <frontend_type>select</frontend_type>
35
- <source_model>pb_pbgsp/authapioptions</source_model>-->
36
- <frontend_type>text</frontend_type>
37
- <sort_order>15</sort_order>
38
- <show_in_default>1</show_in_default>
39
- <show_in_website>1</show_in_website>
40
- <show_in_store>1</show_in_store>
41
- </authorization_endpoint>
42
- <checkout_endpoint translate="label">
43
- <label>Checkout Endpoint</label>
44
- <frontend_type>text</frontend_type>
45
- <sort_order>16</sort_order>
46
- <show_in_default>1</show_in_default>
47
- <show_in_website>1</show_in_website>
48
- <show_in_store>1</show_in_store>
49
- </checkout_endpoint>
50
- <order_mgmt_api translate="label">
51
- <label>ASN Endpoint</label>
52
- <frontend_type>text</frontend_type>
53
-
54
- <sort_order>17</sort_order>
55
- <show_in_default>1</show_in_default>
56
- <show_in_website>1</show_in_website>
57
- <show_in_store>1</show_in_store>
58
- </order_mgmt_api>
59
- <apiuser translate="label">
60
- <label>API username</label>
61
- <frontend_type>text</frontend_type>
62
- <backend_model>adminhtml/system_config_backend_encrypted</backend_model>
63
- <sort_order>20</sort_order>
64
- <show_in_default>1</show_in_default>
65
- <show_in_website>1</show_in_website>
66
- <show_in_store>1</show_in_store>
67
- </apiuser>
68
- <apipass translate="label">
69
- <label>API password</label>
70
- <frontend_type>password</frontend_type>
71
- <backend_model>adminhtml/system_config_backend_encrypted</backend_model>
72
- <sort_order>30</sort_order>
73
- <show_in_default>1</show_in_default>
74
- <show_in_website>1</show_in_website>
75
- <show_in_store>1</show_in_store>
76
- </apipass>
77
- <ftpuser translate="label">
78
- <label>SFTP username</label>
79
- <frontend_type>text</frontend_type>
80
- <backend_model>adminhtml/system_config_backend_encrypted</backend_model>
81
- <sort_order>40</sort_order>
82
- <show_in_default>1</show_in_default>
83
- <show_in_website>1</show_in_website>
84
- <show_in_store>1</show_in_store>
85
- </ftpuser>
86
- <ftppass translate="label">
87
- <label>SFTP password</label>
88
- <frontend_type>password</frontend_type>
89
- <backend_model>adminhtml/system_config_backend_encrypted</backend_model>
90
- <sort_order>50</sort_order>
91
- <show_in_default>1</show_in_default>
92
- <show_in_website>1</show_in_website>
93
- <show_in_store>1</show_in_store>
94
- </ftppass>
95
- <ftphost translate="label">
96
- <label>SFTP hostname</label>
97
- <frontend_type>text</frontend_type>
98
- <sort_order>60</sort_order>
99
- <show_in_default>1</show_in_default>
100
- <show_in_website>1</show_in_website>
101
- <show_in_store>1</show_in_store>
102
- </ftphost>
103
- <ftpport translate="label">
104
- <label>SFTP port</label>
105
- <frontend_type>text</frontend_type>
106
- <sort_order>70</sort_order>
107
- <show_in_default>1</show_in_default>
108
- <show_in_website>1</show_in_website>
109
- <show_in_store>1</show_in_store>
110
- </ftpport>
111
- <ftpdir translate="label">
112
- <label>SFTP catalog directory</label>
113
- <frontend_type>text</frontend_type>
114
- <backend_model>adminhtml/system_config_backend_encrypted</backend_model>
115
- <sort_order>80</sort_order>
116
- <show_in_default>1</show_in_default>
117
- <show_in_website>1</show_in_website>
118
- <show_in_store>1</show_in_store>
119
- </ftpdir>
120
- <catalog_diff translate="label">
121
- <label>Catalog update period (hours, min 1 hour)</label>
122
- <frontend_type>text</frontend_type>
123
- <sort_order>90</sort_order>
124
- <show_in_default>1</show_in_default>
125
- <show_in_website>1</show_in_website>
126
- <show_in_store>1</show_in_store>
127
- </catalog_diff>
128
- <catalog_full translate="label">
129
- <label>Full catalog upload period (days)</label>
130
- <frontend_type>text</frontend_type>
131
- <sort_order>100</sort_order>
132
- <show_in_default>1</show_in_default>
133
- <show_in_website>1</show_in_website>
134
- <show_in_store>1</show_in_store>
135
- </catalog_full>
136
- <catalog_size translate="label">
137
- <label>Maximum Records Per File</label>
138
- <frontend_type>text</frontend_type>
139
- <validate>validate-number</validate>
140
- <sort_order>105</sort_order>
141
- <show_in_default>1</show_in_default>
142
- <show_in_website>1</show_in_website>
143
- <show_in_store>1</show_in_store>
144
- </catalog_size>
145
- <catalog_sender_id translate="label">
146
- <label>Catalog Sender ID</label>
147
- <frontend_type>text</frontend_type>
148
-
149
- <sort_order>106</sort_order>
150
- <show_in_default>1</show_in_default>
151
- <show_in_website>1</show_in_website>
152
- <show_in_store>1</show_in_store>
153
- </catalog_sender_id>
154
- <admin_email translate="label">
155
- <label>Admin Email</label>
156
- <frontend_type>text</frontend_type>
157
- <validate>validate-email</validate>
158
- <sort_order>110</sort_order>
159
- <show_in_default>1</show_in_default>
160
- <show_in_website>1</show_in_website>
161
- <show_in_store>1</show_in_store>
162
- </admin_email>
163
- <catalog_encryption_enabled translate="label">
164
- <label>Catalog Encryption Enabled</label>
165
- <frontend_type>select</frontend_type>
166
- <source_model>adminhtml/system_config_source_yesno</source_model>
167
- <sort_order>115</sort_order>
168
- <show_in_default>1</show_in_default>
169
- <show_in_website>1</show_in_website>
170
- <show_in_store>1</show_in_store>
171
- </catalog_encryption_enabled>
172
- <encryption_public_key translate="label">
173
- <label>Catalog Encryption Public Key</label>
174
- <frontend_type>textarea</frontend_type>
175
- <sort_order>120</sort_order>
176
- <show_in_default>1</show_in_default>
177
- <show_in_website>1</show_in_website>
178
- <show_in_store>1</show_in_store>
179
- </encryption_public_key>
180
- <notify_catalog_ok translate="label">
181
- <label>Notify on Successful Catalog Export</label>
182
- <frontend_type>select</frontend_type>
183
- <source_model>adminhtml/system_config_source_yesno</source_model>
184
- <sort_order>121</sort_order>
185
- <show_in_default>1</show_in_default>
186
- <show_in_website>1</show_in_website>
187
- <show_in_store>1</show_in_store>
188
- </notify_catalog_ok>
189
- <notify_catalog_err translate="label">
190
- <label>Notify on Catalog Export Failure</label>
191
- <frontend_type>select</frontend_type>
192
- <source_model>adminhtml/system_config_source_yesno</source_model>
193
- <sort_order>122</sort_order>
194
- <show_in_default>1</show_in_default>
195
- <show_in_website>1</show_in_website>
196
- <show_in_store>1</show_in_store>
197
- </notify_catalog_err>
198
- <asn_generation_enabled translate="label">
199
- <label>Generate ASN</label>
200
- <frontend_type>select</frontend_type>
201
- <source_model>adminhtml/system_config_source_yesno</source_model>
202
- <sort_order>125</sort_order>
203
- <show_in_default>1</show_in_default>
204
- <show_in_website>1</show_in_website>
205
- <show_in_store>1</show_in_store>
206
- </asn_generation_enabled>
207
-
208
- <!--
209
- If the free_shipping_enable flag enable, the system will check free_shipping_subtotal to give free shipping
210
- otherwise will use shopping cart price rule behaviour
211
- -->
212
- <free_shipping_enable translate="label">
213
- <label>Free shipping with minimum order amount</label>
214
- <frontend_type>select</frontend_type>
215
- <source_model>adminhtml/system_config_source_enabledisable</source_model>
216
- <sort_order>160</sort_order>
217
- <show_in_default>1</show_in_default>
218
- <show_in_website>1</show_in_website>
219
- <show_in_store>1</show_in_store>
220
- </free_shipping_enable>
221
- <free_shipping_subtotal translate="label">
222
- <label>Minimum order amount for free shipping</label>
223
- <frontend_type>text</frontend_type>
224
- <sort_order>170</sort_order>
225
- <show_in_default>1</show_in_default>
226
- <show_in_website>1</show_in_website>
227
- <show_in_store>1</show_in_store>
228
- </free_shipping_subtotal>
229
- <free_tax_enable translate="label">
230
- <label>Enable zero tax for customer</label>
231
- <frontend_type>select</frontend_type>
232
- <source_model>adminhtml/system_config_source_enabledisable</source_model>
233
- <sort_order>175</sort_order>
234
- <show_in_default>1</show_in_default>
235
- <show_in_website>1</show_in_website>
236
- <show_in_store>1</show_in_store>
237
- </free_tax_enable>
238
-
239
- <sort_order translate="label">
240
- <label>Sort order</label>
241
- <frontend_type>text</frontend_type>
242
- <sort_order>230</sort_order>
243
- <show_in_default>1</show_in_default>
244
- <show_in_website>1</show_in_website>
245
- <show_in_store>1</show_in_store>
246
- </sort_order>
247
- <title translate="label">
248
- <label>Title</label>
249
- <validate>required-entry</validate>
250
- <frontend_type>text</frontend_type>
251
- <validate>required-entry</validate>
252
- <sort_order>240</sort_order>
253
- <show_in_default>1</show_in_default>
254
- <show_in_website>1</show_in_website>
255
- <show_in_store>1</show_in_store>
256
- </title>
257
- <!-- added by BigPixel 6/5/2012 -->
258
- <handlingfee translate="label">
259
- <label>Handling Fee</label>
260
- <frontend_type>text</frontend_type>
261
- <sort_order>241</sort_order>
262
- <show_in_default>1</show_in_default>
263
- <show_in_website>1</show_in_website>
264
- <show_in_store>1</show_in_store>
265
- </handlingfee>
266
- <handlingoption translate="label">
267
- <label>Handling Fee Apply As</label>
268
- <frontend_type>select</frontend_type>
269
- <source_model>pb_pbgsp/handlingoptions</source_model>
270
- <sort_order>242</sort_order>
271
- <show_in_default>1</show_in_default>
272
- <show_in_website>1</show_in_website>
273
- <show_in_store>1</show_in_store>
274
- </handlingoption>
275
- <domestic_shipping_fee translate="label">
276
- <label>Domestic Shipping Fee</label>
277
- <frontend_type>text</frontend_type>
278
- <sort_order>243</sort_order>
279
- <show_in_default>1</show_in_default>
280
- <show_in_website>1</show_in_website>
281
- <show_in_store>1</show_in_store>
282
- </domestic_shipping_fee>
283
- <domestic_shipping_option translate="label">
284
- <label>Apply Domestic shipping fee as</label>
285
- <frontend_type>select</frontend_type>
286
- <source_model>pb_pbgsp/handlingoptions</source_model>
287
- <sort_order>244</sort_order>
288
- <show_in_default>1</show_in_default>
289
- <show_in_website>1</show_in_website>
290
- <show_in_store>1</show_in_store>
291
- </domestic_shipping_option>
292
- <delivery_adjustment_min_days translate="label">
293
- <label>Minimum Delivery Days to PB Hub</label>
294
- <frontend_type>text</frontend_type>
295
- <validate>validate-number</validate>
296
- <sort_order>245</sort_order>
297
- <show_in_default>1</show_in_default>
298
- <show_in_website>1</show_in_website>
299
- <show_in_store>1</show_in_store>
300
- </delivery_adjustment_min_days>
301
- <delivery_adjustment_max_days translate="label">
302
- <label>Maximum Delivery Days to PB Hub</label>
303
- <frontend_type>text</frontend_type>
304
- <validate>validate-number</validate>
305
- <sort_order>246</sort_order>
306
- <show_in_default>1</show_in_default>
307
- <show_in_website>1</show_in_website>
308
- <show_in_store>1</show_in_store>
309
- </delivery_adjustment_max_days>
310
- <!-- added by BigPixel 6/5/2012 -->
311
- <sallowspecific translate="label">
312
- <label>Ship to applicable countries</label>
313
- <frontend_type>select</frontend_type>
314
- <sort_order>250</sort_order>
315
- <frontend_class>shipping-applicable-country</frontend_class>
316
- <source_model>adminhtml/system_config_source_shipping_allspecificcountries</source_model>
317
- <show_in_default>1</show_in_default>
318
- <show_in_website>1</show_in_website>
319
- <show_in_store>1</show_in_store>
320
- </sallowspecific>
321
- <specificcountry translate="label">
322
- <label>Ship to Specific countries</label>
323
- <frontend_type>multiselect</frontend_type>
324
- <sort_order>251</sort_order>
325
- <source_model>adminhtml/system_config_source_country</source_model>
326
- <show_in_default>1</show_in_default>
327
- <show_in_website>1</show_in_website>
328
- <show_in_store>1</show_in_store>
329
- </specificcountry>
330
- <showmethod translate="label">
331
- <label>Show Method if Not Applicable</label>
332
- <frontend_type>select</frontend_type>
333
- <sort_order>260</sort_order>
334
- <frontend_class>shipping-skip-hide</frontend_class>
335
- <source_model>adminhtml/system_config_source_yesno</source_model>
336
- <show_in_default>1</show_in_default>
337
- <show_in_website>1</show_in_website>
338
- <show_in_store>0</show_in_store>
339
- </showmethod>
340
- <specificerrmsg translate="label">
341
- <label>Displayed Error Message</label>
342
- <frontend_type>textarea</frontend_type>
343
- <sort_order>270</sort_order>
344
- <show_in_default>1</show_in_default>
345
- <show_in_website>1</show_in_website>
346
- <show_in_store>1</show_in_store>
347
- </specificerrmsg>
348
- <!-- test comments -->
349
- <trackinglink translate="label">
350
- <label>Enable Tracking Links</label>
351
- <frontend_type>select</frontend_type>
352
- <source_model>adminhtml/system_config_source_yesno</source_model>
353
- <sort_order>271</sort_order>
354
- <show_in_default>1</show_in_default>
355
- <show_in_website>1</show_in_website>
356
- <show_in_store>1</show_in_store>
357
- </trackinglink>
358
- <suppress_domestic_tracking translate="label">
359
- <label>Suppress Domestic Leg Tracking</label>
360
- <frontend_type>select</frontend_type>
361
- <sort_order>280</sort_order>
362
- <frontend_class>shipping-skip-hide</frontend_class>
363
- <source_model>adminhtml/system_config_source_yesno</source_model>
364
- <show_in_default>1</show_in_default>
365
- <show_in_website>1</show_in_website>
366
- <show_in_store>1</show_in_store>
367
- </suppress_domestic_tracking>
368
- <custom_shipment_email_subject translate="label">
369
- <label>Custom Shipment Email Subject</label>
370
- <frontend_type>text</frontend_type>
371
-
372
- <sort_order>281</sort_order>
373
- <show_in_default>1</show_in_default>
374
- <show_in_website>1</show_in_website>
375
- <show_in_store>1</show_in_store>
376
- </custom_shipment_email_subject>
377
- <custom_shipment_email_template>
378
- <label>Custom Shipment Email</label>
379
- <frontend_type>textarea</frontend_type>
380
- <sort_order>282</sort_order>
381
- <show_in_default>1</show_in_default>
382
- <show_in_website>1</show_in_website>
383
- <show_in_store>1</show_in_store>
384
- </custom_shipment_email_template>
385
- <separate_log_file translate="label">
386
- <label>Log in separate file</label>
387
- <frontend_type>select</frontend_type>
388
- <sort_order>283</sort_order>
389
- <frontend_class>shipping-skip-hide</frontend_class>
390
- <source_model>adminhtml/system_config_source_yesno</source_model>
391
- <show_in_default>1</show_in_default>
392
- <show_in_website>1</show_in_website>
393
- <show_in_store>1</show_in_store>
394
- </separate_log_file>
395
- <return_address_street1 translate="label">
396
- <label>Return Address Street 1</label>
397
- <frontend_type>text</frontend_type>
398
-
399
- <sort_order>284</sort_order>
400
- <show_in_default>1</show_in_default>
401
- <show_in_website>1</show_in_website>
402
- <show_in_store>1</show_in_store>
403
- </return_address_street1>
404
- <return_address_city translate="label">
405
- <label>Return Address City</label>
406
- <frontend_type>text</frontend_type>
407
-
408
- <sort_order>285</sort_order>
409
- <show_in_default>1</show_in_default>
410
- <show_in_website>1</show_in_website>
411
- <show_in_store>1</show_in_store>
412
- </return_address_city>
413
- <return_address_state translate="label">
414
- <label>Province/State</label>
415
- <frontend_type>text</frontend_type>
416
-
417
- <sort_order>286</sort_order>
418
- <show_in_default>1</show_in_default>
419
- <show_in_website>1</show_in_website>
420
- <show_in_store>1</show_in_store>
421
- </return_address_state>
422
- <return_address_country translate="label">
423
- <label>Country</label>
424
- <frontend_type>select</frontend_type>
425
- <source_model>adminhtml/system_config_source_country</source_model>
426
- <sort_order>287</sort_order>
427
- <show_in_default>1</show_in_default>
428
- <show_in_website>1</show_in_website>
429
- <show_in_store>1</show_in_store>
430
- </return_address_country>
431
- <return_address_zip translate="label">
432
- <label>Zip or Postal Code</label>
433
- <frontend_type>text</frontend_type>
434
-
435
- <sort_order>288</sort_order>
436
- <show_in_default>1</show_in_default>
437
- <show_in_website>1</show_in_website>
438
- <show_in_store>1</show_in_store>
439
- </return_address_zip>
440
- </fields>
441
- </pbgsp>
442
- </groups>
443
- </carriers>
444
-
445
- </sections>
446
- </config>
 
 
 
 
 
 
1
+ <?xml version="1.0"?>
2
+ <config>
3
+ <sections>
4
+ <carriers>
5
+ <groups>
6
+ <pbgsp translate="label" module="shipping">
7
+ <label>Pitney Bowes PBGSP</label>
8
+ <frontend_type>text</frontend_type>
9
+ <sort_order>13</sort_order>
10
+ <show_in_default>1</show_in_default>
11
+ <show_in_website>1</show_in_website>
12
+ <show_in_store>1</show_in_store>
13
+ <fields>
14
+ <active translate="label">
15
+ <label>Enabled</label>
16
+ <frontend_type>select</frontend_type>
17
+ <source_model>adminhtml/system_config_source_yesno</source_model>
18
+ <sort_order>1</sort_order>
19
+ <show_in_default>1</show_in_default>
20
+ <show_in_website>1</show_in_website>
21
+ <show_in_store>1</show_in_store>
22
+ </active>
23
+ <merchantcode translate="label">
24
+ <label>Merchant Code</label>
25
+ <frontend_type>text</frontend_type>
26
+ <backend_model>adminhtml/system_config_backend_encrypted</backend_model>
27
+ <sort_order>10</sort_order>
28
+ <show_in_default>1</show_in_default>
29
+ <show_in_website>1</show_in_website>
30
+ <show_in_store>1</show_in_store>
31
+ </merchantcode>
32
+ <authorization_endpoint translate="label">
33
+ <label>Authorization Endpoint</label>
34
+ <frontend_type>text</frontend_type>
35
+ <sort_order>15</sort_order>
36
+ <show_in_default>1</show_in_default>
37
+ <show_in_website>1</show_in_website>
38
+ <show_in_store>1</show_in_store>
39
+ </authorization_endpoint>
40
+ <checkout_endpoint translate="label">
41
+ <label>Checkout Endpoint</label>
42
+ <frontend_type>text</frontend_type>
43
+ <sort_order>16</sort_order>
44
+ <show_in_default>1</show_in_default>
45
+ <show_in_website>1</show_in_website>
46
+ <show_in_store>1</show_in_store>
47
+ </checkout_endpoint>
48
+ <order_mgmt_api translate="label">
49
+ <label>ASN Endpoint</label>
50
+ <frontend_type>text</frontend_type>
51
+
52
+ <sort_order>17</sort_order>
53
+ <show_in_default>1</show_in_default>
54
+ <show_in_website>1</show_in_website>
55
+ <show_in_store>1</show_in_store>
56
+ </order_mgmt_api>
57
+ <apiuser translate="label">
58
+ <label>API username</label>
59
+ <frontend_type>text</frontend_type>
60
+ <backend_model>adminhtml/system_config_backend_encrypted</backend_model>
61
+ <sort_order>20</sort_order>
62
+ <show_in_default>1</show_in_default>
63
+ <show_in_website>1</show_in_website>
64
+ <show_in_store>1</show_in_store>
65
+ </apiuser>
66
+ <apipass translate="label">
67
+ <label>API password</label>
68
+ <frontend_type>password</frontend_type>
69
+ <backend_model>adminhtml/system_config_backend_encrypted</backend_model>
70
+ <sort_order>30</sort_order>
71
+ <show_in_default>1</show_in_default>
72
+ <show_in_website>1</show_in_website>
73
+ <show_in_store>1</show_in_store>
74
+ </apipass>
75
+ <ftpuser translate="label">
76
+ <label>SFTP username</label>
77
+ <frontend_type>text</frontend_type>
78
+ <backend_model>adminhtml/system_config_backend_encrypted</backend_model>
79
+ <sort_order>40</sort_order>
80
+ <show_in_default>1</show_in_default>
81
+ <show_in_website>1</show_in_website>
82
+ <show_in_store>1</show_in_store>
83
+ </ftpuser>
84
+ <ftppass translate="label">
85
+ <label>SFTP password</label>
86
+ <frontend_type>password</frontend_type>
87
+ <backend_model>adminhtml/system_config_backend_encrypted</backend_model>
88
+ <sort_order>50</sort_order>
89
+ <show_in_default>1</show_in_default>
90
+ <show_in_website>1</show_in_website>
91
+ <show_in_store>1</show_in_store>
92
+ </ftppass>
93
+ <ftphost translate="label">
94
+ <label>SFTP hostname</label>
95
+ <frontend_type>text</frontend_type>
96
+ <sort_order>60</sort_order>
97
+ <show_in_default>1</show_in_default>
98
+ <show_in_website>1</show_in_website>
99
+ <show_in_store>1</show_in_store>
100
+ </ftphost>
101
+ <ftpport translate="label">
102
+ <label>SFTP port</label>
103
+ <frontend_type>text</frontend_type>
104
+ <sort_order>70</sort_order>
105
+ <show_in_default>1</show_in_default>
106
+ <show_in_website>1</show_in_website>
107
+ <show_in_store>1</show_in_store>
108
+ </ftpport>
109
+ <ftpdir translate="label">
110
+ <label>SFTP catalog directory</label>
111
+ <frontend_type>text</frontend_type>
112
+ <backend_model>adminhtml/system_config_backend_encrypted</backend_model>
113
+ <sort_order>80</sort_order>
114
+ <show_in_default>1</show_in_default>
115
+ <show_in_website>1</show_in_website>
116
+ <show_in_store>1</show_in_store>
117
+ </ftpdir>
118
+ <catalog_diff translate="label">
119
+ <label>Catalog update period (hours, min 1 hour)</label>
120
+ <frontend_type>text</frontend_type>
121
+ <sort_order>90</sort_order>
122
+ <show_in_default>1</show_in_default>
123
+ <show_in_website>1</show_in_website>
124
+ <show_in_store>1</show_in_store>
125
+ </catalog_diff>
126
+ <catalog_full translate="label">
127
+ <label>Full catalog upload period (days)</label>
128
+ <frontend_type>text</frontend_type>
129
+ <sort_order>100</sort_order>
130
+ <show_in_default>1</show_in_default>
131
+ <show_in_website>1</show_in_website>
132
+ <show_in_store>1</show_in_store>
133
+ </catalog_full>
134
+ <catalog_size translate="label">
135
+ <label>Maximum Records Per File</label>
136
+ <frontend_type>text</frontend_type>
137
+ <validate>validate-number</validate>
138
+ <sort_order>105</sort_order>
139
+ <show_in_default>1</show_in_default>
140
+ <show_in_website>1</show_in_website>
141
+ <show_in_store>1</show_in_store>
142
+ </catalog_size>
143
+ <catalog_sender_id translate="label">
144
+ <label>Catalog Sender ID</label>
145
+ <frontend_type>text</frontend_type>
146
+
147
+ <sort_order>106</sort_order>
148
+ <show_in_default>1</show_in_default>
149
+ <show_in_website>1</show_in_website>
150
+ <show_in_store>1</show_in_store>
151
+ </catalog_sender_id>
152
+ <admin_email translate="label">
153
+ <label>Admin Email</label>
154
+ <frontend_type>text</frontend_type>
155
+ <validate>validate-email</validate>
156
+ <sort_order>110</sort_order>
157
+ <show_in_default>1</show_in_default>
158
+ <show_in_website>1</show_in_website>
159
+ <show_in_store>1</show_in_store>
160
+ </admin_email>
161
+ <catalog_encryption_enabled translate="label">
162
+ <label>Catalog Encryption Enabled</label>
163
+ <frontend_type>select</frontend_type>
164
+ <source_model>adminhtml/system_config_source_yesno</source_model>
165
+ <sort_order>115</sort_order>
166
+ <show_in_default>1</show_in_default>
167
+ <show_in_website>1</show_in_website>
168
+ <show_in_store>1</show_in_store>
169
+ </catalog_encryption_enabled>
170
+ <encryption_public_key translate="label">
171
+ <label>Catalog Encryption Public Key</label>
172
+ <frontend_type>textarea</frontend_type>
173
+ <sort_order>120</sort_order>
174
+ <show_in_default>1</show_in_default>
175
+ <show_in_website>1</show_in_website>
176
+ <show_in_store>1</show_in_store>
177
+ </encryption_public_key>
178
+ <notify_catalog_ok translate="label">
179
+ <label>Notify on Successful Catalog Export</label>
180
+ <frontend_type>select</frontend_type>
181
+ <source_model>adminhtml/system_config_source_yesno</source_model>
182
+ <sort_order>121</sort_order>
183
+ <show_in_default>1</show_in_default>
184
+ <show_in_website>1</show_in_website>
185
+ <show_in_store>1</show_in_store>
186
+ </notify_catalog_ok>
187
+ <notify_catalog_err translate="label">
188
+ <label>Notify on Catalog Export Failure</label>
189
+ <frontend_type>select</frontend_type>
190
+ <source_model>adminhtml/system_config_source_yesno</source_model>
191
+ <sort_order>122</sort_order>
192
+ <show_in_default>1</show_in_default>
193
+ <show_in_website>1</show_in_website>
194
+ <show_in_store>1</show_in_store>
195
+ </notify_catalog_err>
196
+ <asn_generation_enabled translate="label">
197
+ <label>Generate ASN</label>
198
+ <frontend_type>select</frontend_type>
199
+ <source_model>adminhtml/system_config_source_yesno</source_model>
200
+ <sort_order>125</sort_order>
201
+ <show_in_default>1</show_in_default>
202
+ <show_in_website>1</show_in_website>
203
+ <show_in_store>1</show_in_store>
204
+ </asn_generation_enabled>
205
+ <override_shipping_address_enabled translate="label">
206
+ <label>Override Shipping Address</label>
207
+ <frontend_type>select</frontend_type>
208
+ <source_model>adminhtml/system_config_source_yesno</source_model>
209
+ <sort_order>128</sort_order>
210
+ <show_in_default>1</show_in_default>
211
+ <show_in_website>1</show_in_website>
212
+ <show_in_store>1</show_in_store>
213
+ </override_shipping_address_enabled>
214
+ <!--
215
+ If the free_shipping_enable flag enable, the system will check free_shipping_subtotal to give free shipping
216
+ otherwise will use shopping cart price rule behaviour
217
+ -->
218
+ <free_shipping_enable translate="label">
219
+ <label>Free shipping with minimum order amount</label>
220
+ <frontend_type>select</frontend_type>
221
+ <source_model>adminhtml/system_config_source_enabledisable</source_model>
222
+ <sort_order>160</sort_order>
223
+ <show_in_default>1</show_in_default>
224
+ <show_in_website>1</show_in_website>
225
+ <show_in_store>1</show_in_store>
226
+ </free_shipping_enable>
227
+ <free_shipping_subtotal translate="label">
228
+ <label>Minimum order amount for free shipping</label>
229
+ <frontend_type>text</frontend_type>
230
+ <sort_order>170</sort_order>
231
+ <show_in_default>1</show_in_default>
232
+ <show_in_website>1</show_in_website>
233
+ <show_in_store>1</show_in_store>
234
+ </free_shipping_subtotal>
235
+ <free_tax_enable translate="label">
236
+ <label>Enable zero tax for customer</label>
237
+ <frontend_type>select</frontend_type>
238
+ <source_model>adminhtml/system_config_source_enabledisable</source_model>
239
+ <sort_order>175</sort_order>
240
+ <show_in_default>1</show_in_default>
241
+ <show_in_website>1</show_in_website>
242
+ <show_in_store>1</show_in_store>
243
+ </free_tax_enable>
244
+
245
+ <sort_order translate="label">
246
+ <label>Sort order</label>
247
+ <frontend_type>text</frontend_type>
248
+ <sort_order>230</sort_order>
249
+ <show_in_default>1</show_in_default>
250
+ <show_in_website>1</show_in_website>
251
+ <show_in_store>1</show_in_store>
252
+ </sort_order>
253
+ <title translate="label">
254
+ <label>Title</label>
255
+ <validate>required-entry</validate>
256
+ <frontend_type>text</frontend_type>
257
+ <validate>required-entry</validate>
258
+ <sort_order>240</sort_order>
259
+ <show_in_default>1</show_in_default>
260
+ <show_in_website>1</show_in_website>
261
+ <show_in_store>1</show_in_store>
262
+ </title>
263
+ <!-- added by BigPixel 6/5/2012 -->
264
+ <handlingfee translate="label">
265
+ <label>Handling Fee</label>
266
+ <frontend_type>text</frontend_type>
267
+ <sort_order>241</sort_order>
268
+ <show_in_default>1</show_in_default>
269
+ <show_in_website>1</show_in_website>
270
+ <show_in_store>1</show_in_store>
271
+ </handlingfee>
272
+ <handlingoption translate="label">
273
+ <label>Handling Fee Apply As</label>
274
+ <frontend_type>select</frontend_type>
275
+ <source_model>pb_pbgsp/handlingoptions</source_model>
276
+ <sort_order>242</sort_order>
277
+ <show_in_default>1</show_in_default>
278
+ <show_in_website>1</show_in_website>
279
+ <show_in_store>1</show_in_store>
280
+ </handlingoption>
281
+ <domestic_shipping_fee translate="label">
282
+ <label>Domestic Shipping Fee</label>
283
+ <frontend_type>text</frontend_type>
284
+ <sort_order>243</sort_order>
285
+ <show_in_default>1</show_in_default>
286
+ <show_in_website>1</show_in_website>
287
+ <show_in_store>1</show_in_store>
288
+ </domestic_shipping_fee>
289
+ <domestic_shipping_option translate="label">
290
+ <label>Apply Domestic shipping fee as</label>
291
+ <frontend_type>select</frontend_type>
292
+ <source_model>pb_pbgsp/handlingoptions</source_model>
293
+ <sort_order>244</sort_order>
294
+ <show_in_default>1</show_in_default>
295
+ <show_in_website>1</show_in_website>
296
+ <show_in_store>1</show_in_store>
297
+ </domestic_shipping_option>
298
+ <delivery_adjustment_min_days translate="label">
299
+ <label>Minimum Delivery Days to PB Hub</label>
300
+ <frontend_type>text</frontend_type>
301
+ <validate>validate-number</validate>
302
+ <sort_order>245</sort_order>
303
+ <show_in_default>1</show_in_default>
304
+ <show_in_website>1</show_in_website>
305
+ <show_in_store>1</show_in_store>
306
+ </delivery_adjustment_min_days>
307
+ <delivery_adjustment_max_days translate="label">
308
+ <label>Maximum Delivery Days to PB Hub</label>
309
+ <frontend_type>text</frontend_type>
310
+ <validate>validate-number</validate>
311
+ <sort_order>246</sort_order>
312
+ <show_in_default>1</show_in_default>
313
+ <show_in_website>1</show_in_website>
314
+ <show_in_store>1</show_in_store>
315
+ </delivery_adjustment_max_days>
316
+ <!-- added by BigPixel 6/5/2012 -->
317
+ <sallowspecific translate="label">
318
+ <label>Ship to applicable countries</label>
319
+ <frontend_type>select</frontend_type>
320
+ <sort_order>250</sort_order>
321
+ <frontend_class>shipping-applicable-country</frontend_class>
322
+ <source_model>adminhtml/system_config_source_shipping_allspecificcountries</source_model>
323
+ <show_in_default>1</show_in_default>
324
+ <show_in_website>1</show_in_website>
325
+ <show_in_store>1</show_in_store>
326
+ </sallowspecific>
327
+ <specificcountry translate="label">
328
+ <label>Ship to Specific countries</label>
329
+ <frontend_type>multiselect</frontend_type>
330
+ <sort_order>251</sort_order>
331
+ <source_model>adminhtml/system_config_source_country</source_model>
332
+ <show_in_default>1</show_in_default>
333
+ <show_in_website>1</show_in_website>
334
+ <show_in_store>1</show_in_store>
335
+ </specificcountry>
336
+ <showmethod translate="label">
337
+ <label>Show Method if Not Applicable</label>
338
+ <frontend_type>select</frontend_type>
339
+ <sort_order>260</sort_order>
340
+ <frontend_class>shipping-skip-hide</frontend_class>
341
+ <source_model>adminhtml/system_config_source_yesno</source_model>
342
+ <show_in_default>1</show_in_default>
343
+ <show_in_website>1</show_in_website>
344
+ <show_in_store>0</show_in_store>
345
+ </showmethod>
346
+ <specificerrmsg translate="label">
347
+ <label>Displayed Error Message</label>
348
+ <frontend_type>textarea</frontend_type>
349
+ <sort_order>270</sort_order>
350
+ <show_in_default>1</show_in_default>
351
+ <show_in_website>1</show_in_website>
352
+ <show_in_store>1</show_in_store>
353
+ </specificerrmsg>
354
+ <!-- test comments -->
355
+ <trackinglink translate="label">
356
+ <label>Enable Tracking Links</label>
357
+ <frontend_type>select</frontend_type>
358
+ <source_model>adminhtml/system_config_source_yesno</source_model>
359
+ <sort_order>271</sort_order>
360
+ <show_in_default>1</show_in_default>
361
+ <show_in_website>1</show_in_website>
362
+ <show_in_store>1</show_in_store>
363
+ </trackinglink>
364
+ <suppress_domestic_tracking translate="label">
365
+ <label>Suppress Domestic Leg Tracking</label>
366
+ <frontend_type>select</frontend_type>
367
+ <sort_order>280</sort_order>
368
+ <frontend_class>shipping-skip-hide</frontend_class>
369
+ <source_model>adminhtml/system_config_source_yesno</source_model>
370
+ <show_in_default>1</show_in_default>
371
+ <show_in_website>1</show_in_website>
372
+ <show_in_store>1</show_in_store>
373
+ </suppress_domestic_tracking>
374
+ <custom_shipment_email_subject translate="label">
375
+ <label>Custom Shipment Email Subject</label>
376
+ <frontend_type>text</frontend_type>
377
+
378
+ <sort_order>281</sort_order>
379
+ <show_in_default>1</show_in_default>
380
+ <show_in_website>1</show_in_website>
381
+ <show_in_store>1</show_in_store>
382
+ </custom_shipment_email_subject>
383
+ <custom_shipment_email_template>
384
+ <label>Custom Shipment Email</label>
385
+ <frontend_type>textarea</frontend_type>
386
+ <sort_order>282</sort_order>
387
+ <show_in_default>1</show_in_default>
388
+ <show_in_website>1</show_in_website>
389
+ <show_in_store>1</show_in_store>
390
+ </custom_shipment_email_template>
391
+ <separate_log_file translate="label">
392
+ <label>Log in separate file</label>
393
+ <frontend_type>select</frontend_type>
394
+ <sort_order>283</sort_order>
395
+ <frontend_class>shipping-skip-hide</frontend_class>
396
+ <source_model>adminhtml/system_config_source_yesno</source_model>
397
+ <show_in_default>1</show_in_default>
398
+ <show_in_website>1</show_in_website>
399
+ <show_in_store>1</show_in_store>
400
+ </separate_log_file>
401
+ <return_address_street1 translate="label">
402
+ <label>Return Address Street 1</label>
403
+ <frontend_type>text</frontend_type>
404
+
405
+ <sort_order>284</sort_order>
406
+ <show_in_default>1</show_in_default>
407
+ <show_in_website>1</show_in_website>
408
+ <show_in_store>1</show_in_store>
409
+ </return_address_street1>
410
+ <return_address_city translate="label">
411
+ <label>Return Address City</label>
412
+ <frontend_type>text</frontend_type>
413
+
414
+ <sort_order>285</sort_order>
415
+ <show_in_default>1</show_in_default>
416
+ <show_in_website>1</show_in_website>
417
+ <show_in_store>1</show_in_store>
418
+ </return_address_city>
419
+ <return_address_state translate="label">
420
+ <label>Province/State</label>
421
+ <frontend_type>text</frontend_type>
422
+
423
+ <sort_order>286</sort_order>
424
+ <show_in_default>1</show_in_default>
425
+ <show_in_website>1</show_in_website>
426
+ <show_in_store>1</show_in_store>
427
+ </return_address_state>
428
+ <return_address_country translate="label">
429
+ <label>Country</label>
430
+ <frontend_type>select</frontend_type>
431
+ <source_model>adminhtml/system_config_source_country</source_model>
432
+ <sort_order>287</sort_order>
433
+ <show_in_default>1</show_in_default>
434
+ <show_in_website>1</show_in_website>
435
+ <show_in_store>1</show_in_store>
436
+ </return_address_country>
437
+ <return_address_zip translate="label">
438
+ <label>Zip or Postal Code</label>
439
+ <frontend_type>text</frontend_type>
440
+
441
+ <sort_order>288</sort_order>
442
+ <show_in_default>1</show_in_default>
443
+ <show_in_website>1</show_in_website>
444
+ <show_in_store>1</show_in_store>
445
+ </return_address_zip>
446
+ </fields>
447
+ </pbgsp>
448
+ </groups>
449
+ </carriers>
450
+
451
+ </sections>
452
+ </config>
app/code/local/Pb/Pbgsp/etc/system.xml_bk ADDED
@@ -0,0 +1,453 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?xml version="1.0"?>
2
+ <config>
3
+ <sections>
4
+ <carriers>
5
+ <groups>
6
+ <pbgsp translate="label" module="shipping">
7
+ <label>Pitney Bowes PBGSP</label>
8
+ <frontend_type>text</frontend_type>
9
+ <sort_order>13</sort_order>
10
+ <show_in_default>1</show_in_default>
11
+ <show_in_website>1</show_in_website>
12
+ <show_in_store>1</show_in_store>
13
+ <fields>
14
+ <active translate="label">
15
+ <label>Enabled</label>
16
+ <frontend_type>select</frontend_type>
17
+ <source_model>adminhtml/system_config_source_yesno</source_model>
18
+ <sort_order>1</sort_order>
19
+ <show_in_default>1</show_in_default>
20
+ <show_in_website>1</show_in_website>
21
+ <show_in_store>1</show_in_store>
22
+ </active>
23
+ <merchantcode translate="label">
24
+ <label>Merchant Code</label>
25
+ <frontend_type>text</frontend_type>
26
+ <backend_model>adminhtml/system_config_backend_encrypted</backend_model>
27
+ <sort_order>10</sort_order>
28
+ <show_in_default>1</show_in_default>
29
+ <show_in_website>1</show_in_website>
30
+ <show_in_store>1</show_in_store>
31
+ </merchantcode>
32
+ <authorization_endpoint translate="label">
33
+ <label>Authorization Endpoint</label>
34
+ <frontend_type>text</frontend_type>
35
+ <sort_order>15</sort_order>
36
+ <show_in_default>1</show_in_default>
37
+ <show_in_website>1</show_in_website>
38
+ <show_in_store>1</show_in_store>
39
+ </authorization_endpoint>
40
+ <checkout_endpoint translate="label">
41
+ <label>Checkout Endpoint</label>
42
+ <frontend_type>text</frontend_type>
43
+ <sort_order>16</sort_order>
44
+ <show_in_default>1</show_in_default>
45
+ <show_in_website>1</show_in_website>
46
+ <show_in_store>1</show_in_store>
47
+ </checkout_endpoint>
48
+ <order_mgmt_api translate="label">
49
+ <label>ASN Endpoint</label>
50
+ <frontend_type>text</frontend_type>
51
+
52
+ <sort_order>17</sort_order>
53
+ <show_in_default>1</show_in_default>
54
+ <show_in_website>1</show_in_website>
55
+ <show_in_store>1</show_in_store>
56
+ </order_mgmt_api>
57
+ <apiuser translate="label">
58
+ <label>API username</label>
59
+ <frontend_type>text</frontend_type>
60
+ <backend_model>adminhtml/system_config_backend_encrypted</backend_model>
61
+ <sort_order>20</sort_order>
62
+ <show_in_default>1</show_in_default>
63
+ <show_in_website>1</show_in_website>
64
+ <show_in_store>1</show_in_store>
65
+ </apiuser>
66
+ <apipass translate="label">
67
+ <label>API password</label>
68
+ <frontend_type>password</frontend_type>
69
+ <backend_model>adminhtml/system_config_backend_encrypted</backend_model>
70
+ <sort_order>30</sort_order>
71
+ <show_in_default>1</show_in_default>
72
+ <show_in_website>1</show_in_website>
73
+ <show_in_store>1</show_in_store>
74
+ </apipass>
75
+ <ftpuser translate="label">
76
+ <label>SFTP username</label>
77
+ <frontend_type>text</frontend_type>
78
+ <backend_model>adminhtml/system_config_backend_encrypted</backend_model>
79
+ <sort_order>40</sort_order>
80
+ <show_in_default>1</show_in_default>
81
+ <show_in_website>1</show_in_website>
82
+ <show_in_store>1</show_in_store>
83
+ </ftpuser>
84
+ <ftppass translate="label">
85
+ <label>SFTP password</label>
86
+ <frontend_type>password</frontend_type>
87
+ <backend_model>adminhtml/system_config_backend_encrypted</backend_model>
88
+ <sort_order>50</sort_order>
89
+ <show_in_default>1</show_in_default>
90
+ <show_in_website>1</show_in_website>
91
+ <show_in_store>1</show_in_store>
92
+ </ftppass>
93
+ <ftphost translate="label">
94
+ <label>SFTP hostname</label>
95
+ <frontend_type>text</frontend_type>
96
+ <sort_order>60</sort_order>
97
+ <show_in_default>1</show_in_default>
98
+ <show_in_website>1</show_in_website>
99
+ <show_in_store>1</show_in_store>
100
+ </ftphost>
101
+ <ftpport translate="label">
102
+ <label>SFTP port</label>
103
+ <frontend_type>text</frontend_type>
104
+ <sort_order>70</sort_order>
105
+ <show_in_default>1</show_in_default>
106
+ <show_in_website>1</show_in_website>
107
+ <show_in_store>1</show_in_store>
108
+ </ftpport>
109
+ <ftpdir translate="label">
110
+ <label>SFTP catalog directory</label>
111
+ <frontend_type>text</frontend_type>
112
+ <backend_model>adminhtml/system_config_backend_encrypted</backend_model>
113
+ <sort_order>80</sort_order>
114
+ <show_in_default>1</show_in_default>
115
+ <show_in_website>1</show_in_website>
116
+ <show_in_store>1</show_in_store>
117
+ </ftpdir>
118
+ <catalog_diff translate="label">
119
+ <label>Catalog update period (hours, min 1 hour)</label>
120
+ <frontend_type>text</frontend_type>
121
+ <sort_order>90</sort_order>
122
+ <show_in_default>1</show_in_default>
123
+ <show_in_website>1</show_in_website>
124
+ <show_in_store>1</show_in_store>
125
+ </catalog_diff>
126
+ <catalog_full translate="label">
127
+ <label>Full catalog upload period (days)</label>
128
+ <frontend_type>text</frontend_type>
129
+ <sort_order>100</sort_order>
130
+ <show_in_default>1</show_in_default>
131
+ <show_in_website>1</show_in_website>
132
+ <show_in_store>1</show_in_store>
133
+ </catalog_full>
134
+ <catalog_size translate="label">
135
+ <label>Maximum Records Per File</label>
136
+ <frontend_type>text</frontend_type>
137
+ <validate>validate-number</validate>
138
+ <sort_order>105</sort_order>
139
+ <show_in_default>1</show_in_default>
140
+ <show_in_website>1</show_in_website>
141
+ <show_in_store>1</show_in_store>
142
+ </catalog_size>
143
+ <catalog_sender_id translate="label">
144
+ <label>Catalog Sender ID</label>
145
+ <frontend_type>text</frontend_type>
146
+
147
+ <sort_order>106</sort_order>
148
+ <show_in_default>1</show_in_default>
149
+ <show_in_website>1</show_in_website>
150
+ <show_in_store>1</show_in_store>
151
+ </catalog_sender_id>
152
+ <admin_email translate="label">
153
+ <label>Admin Email</label>
154
+ <frontend_type>text</frontend_type>
155
+ <validate>validate-email</validate>
156
+ <sort_order>110</sort_order>
157
+ <show_in_default>1</show_in_default>
158
+ <show_in_website>1</show_in_website>
159
+ <show_in_store>1</show_in_store>
160
+ </admin_email>
161
+ <catalog_encryption_enabled translate="label">
162
+ <label>Catalog Encryption Enabled</label>
163
+ <frontend_type>select</frontend_type>
164
+ <source_model>adminhtml/system_config_source_yesno</source_model>
165
+ <sort_order>115</sort_order>
166
+ <show_in_default>1</show_in_default>
167
+ <show_in_website>1</show_in_website>
168
+ <show_in_store>1</show_in_store>
169
+ </catalog_encryption_enabled>
170
+ <encryption_public_key translate="label">
171
+ <label>Catalog Encryption Public Key</label>
172
+ <frontend_type>textarea</frontend_type>
173
+ <sort_order>120</sort_order>
174
+ <show_in_default>1</show_in_default>
175
+ <show_in_website>1</show_in_website>
176
+ <show_in_store>1</show_in_store>
177
+ </encryption_public_key>
178
+ <notify_catalog_ok translate="label">
179
+ <label>Notify on Successful Catalog Export</label>
180
+ <frontend_type>select</frontend_type>
181
+ <source_model>adminhtml/system_config_source_yesno</source_model>
182
+ <sort_order>121</sort_order>
183
+ <show_in_default>1</show_in_default>
184
+ <show_in_website>1</show_in_website>
185
+ <show_in_store>1</show_in_store>
186
+ </notify_catalog_ok>
187
+ <notify_catalog_err translate="label">
188
+ <label>Notify on Catalog Export Failure</label>
189
+ <frontend_type>select</frontend_type>
190
+ <source_model>adminhtml/system_config_source_yesno</source_model>
191
+ <sort_order>122</sort_order>
192
+ <show_in_default>1</show_in_default>
193
+ <show_in_website>1</show_in_website>
194
+ <show_in_store>1</show_in_store>
195
+ </notify_catalog_err>
196
+ <asn_generation_enabled translate="label">
197
+ <label>Generate ASN</label>
198
+ <frontend_type>select</frontend_type>
199
+ <source_model>adminhtml/system_config_source_yesno</source_model>
200
+ <sort_order>125</sort_order>
201
+ <show_in_default>1</show_in_default>
202
+ <show_in_website>1</show_in_website>
203
+ <show_in_store>1</show_in_store>
204
+ </asn_generation_enabled>
205
+ <override_shipping_address_enabled translate="label">
206
+ <label>Override Shipping Address</label>
207
+ <frontend_type>select</frontend_type>
208
+ <source_model>adminhtml/system_config_source_yesno</source_model>
209
+ <sort_order>128</sort_order>
210
+ <show_in_default>1</show_in_default>
211
+ <show_in_website>1</show_in_website>
212
+ <show_in_store>1</show_in_store>
213
+ </override_shipping_address_enabled>
214
+
215
+ <!--
216
+ If the free_shipping_enable flag enable, the system will check free_shipping_subtotal to give free shipping
217
+ otherwise will use shopping cart price rule behaviour
218
+ -->
219
+ <free_shipping_enable translate="label">
220
+ <label>Free shipping with minimum order amount</label>
221
+ <frontend_type>select</frontend_type>
222
+ <source_model>adminhtml/system_config_source_enabledisable</source_model>
223
+ <sort_order>160</sort_order>
224
+ <show_in_default>1</show_in_default>
225
+ <show_in_website>1</show_in_website>
226
+ <show_in_store>1</show_in_store>
227
+ </free_shipping_enable>
228
+ <free_shipping_subtotal translate="label">
229
+ <label>Minimum order amount for free shipping</label>
230
+ <frontend_type>text</frontend_type>
231
+ <sort_order>170</sort_order>
232
+ <show_in_default>1</show_in_default>
233
+ <show_in_website>1</show_in_website>
234
+ <show_in_store>1</show_in_store>
235
+ </free_shipping_subtotal>
236
+ <free_tax_enable translate="label">
237
+ <label>Enable zero tax for customer</label>
238
+ <frontend_type>select</frontend_type>
239
+ <source_model>adminhtml/system_config_source_enabledisable</source_model>
240
+ <sort_order>175</sort_order>
241
+ <show_in_default>1</show_in_default>
242
+ <show_in_website>1</show_in_website>
243
+ <show_in_store>1</show_in_store>
244
+ </free_tax_enable>
245
+
246
+ <sort_order translate="label">
247
+ <label>Sort order</label>
248
+ <frontend_type>text</frontend_type>
249
+ <sort_order>230</sort_order>
250
+ <show_in_default>1</show_in_default>
251
+ <show_in_website>1</show_in_website>
252
+ <show_in_store>1</show_in_store>
253
+ </sort_order>
254
+ <title translate="label">
255
+ <label>Title</label>
256
+ <validate>required-entry</validate>
257
+ <frontend_type>text</frontend_type>
258
+ <validate>required-entry</validate>
259
+ <sort_order>240</sort_order>
260
+ <show_in_default>1</show_in_default>
261
+ <show_in_website>1</show_in_website>
262
+ <show_in_store>1</show_in_store>
263
+ </title>
264
+ <!-- added by BigPixel 6/5/2012 -->
265
+ <handlingfee translate="label">
266
+ <label>Handling Fee</label>
267
+ <frontend_type>text</frontend_type>
268
+ <sort_order>241</sort_order>
269
+ <show_in_default>1</show_in_default>
270
+ <show_in_website>1</show_in_website>
271
+ <show_in_store>1</show_in_store>
272
+ </handlingfee>
273
+ <handlingoption translate="label">
274
+ <label>Handling Fee Apply As</label>
275
+ <frontend_type>select</frontend_type>
276
+ <source_model>pb_pbgsp/handlingoptions</source_model>
277
+ <sort_order>242</sort_order>
278
+ <show_in_default>1</show_in_default>
279
+ <show_in_website>1</show_in_website>
280
+ <show_in_store>1</show_in_store>
281
+ </handlingoption>
282
+ <domestic_shipping_fee translate="label">
283
+ <label>Domestic Shipping Fee</label>
284
+ <frontend_type>text</frontend_type>
285
+ <sort_order>243</sort_order>
286
+ <show_in_default>1</show_in_default>
287
+ <show_in_website>1</show_in_website>
288
+ <show_in_store>1</show_in_store>
289
+ </domestic_shipping_fee>
290
+ <domestic_shipping_option translate="label">
291
+ <label>Apply Domestic shipping fee as</label>
292
+ <frontend_type>select</frontend_type>
293
+ <source_model>pb_pbgsp/handlingoptions</source_model>
294
+ <sort_order>244</sort_order>
295
+ <show_in_default>1</show_in_default>
296
+ <show_in_website>1</show_in_website>
297
+ <show_in_store>1</show_in_store>
298
+ </domestic_shipping_option>
299
+ <delivery_adjustment_min_days translate="label">
300
+ <label>Minimum Delivery Days to PB Hub</label>
301
+ <frontend_type>text</frontend_type>
302
+ <validate>validate-number</validate>
303
+ <sort_order>245</sort_order>
304
+ <show_in_default>1</show_in_default>
305
+ <show_in_website>1</show_in_website>
306
+ <show_in_store>1</show_in_store>
307
+ </delivery_adjustment_min_days>
308
+ <delivery_adjustment_max_days translate="label">
309
+ <label>Maximum Delivery Days to PB Hub</label>
310
+ <frontend_type>text</frontend_type>
311
+ <validate>validate-number</validate>
312
+ <sort_order>246</sort_order>
313
+ <show_in_default>1</show_in_default>
314
+ <show_in_website>1</show_in_website>
315
+ <show_in_store>1</show_in_store>
316
+ </delivery_adjustment_max_days>
317
+ <!-- added by BigPixel 6/5/2012 -->
318
+ <sallowspecific translate="label">
319
+ <label>Ship to applicable countries</label>
320
+ <frontend_type>select</frontend_type>
321
+ <sort_order>250</sort_order>
322
+ <frontend_class>shipping-applicable-country</frontend_class>
323
+ <source_model>adminhtml/system_config_source_shipping_allspecificcountries</source_model>
324
+ <show_in_default>1</show_in_default>
325
+ <show_in_website>1</show_in_website>
326
+ <show_in_store>1</show_in_store>
327
+ </sallowspecific>
328
+ <specificcountry translate="label">
329
+ <label>Ship to Specific countries</label>
330
+ <frontend_type>multiselect</frontend_type>
331
+ <sort_order>251</sort_order>
332
+ <source_model>adminhtml/system_config_source_country</source_model>
333
+ <show_in_default>1</show_in_default>
334
+ <show_in_website>1</show_in_website>
335
+ <show_in_store>1</show_in_store>
336
+ </specificcountry>
337
+ <showmethod translate="label">
338
+ <label>Show Method if Not Applicable</label>
339
+ <frontend_type>select</frontend_type>
340
+ <sort_order>260</sort_order>
341
+ <frontend_class>shipping-skip-hide</frontend_class>
342
+ <source_model>adminhtml/system_config_source_yesno</source_model>
343
+ <show_in_default>1</show_in_default>
344
+ <show_in_website>1</show_in_website>
345
+ <show_in_store>0</show_in_store>
346
+ </showmethod>
347
+ <specificerrmsg translate="label">
348
+ <label>Displayed Error Message</label>
349
+ <frontend_type>textarea</frontend_type>
350
+ <sort_order>270</sort_order>
351
+ <show_in_default>1</show_in_default>
352
+ <show_in_website>1</show_in_website>
353
+ <show_in_store>1</show_in_store>
354
+ </specificerrmsg>
355
+ <!-- test comments -->
356
+ <trackinglink translate="label">
357
+ <label>Enable Tracking Links</label>
358
+ <frontend_type>select</frontend_type>
359
+ <source_model>adminhtml/system_config_source_yesno</source_model>
360
+ <sort_order>271</sort_order>
361
+ <show_in_default>1</show_in_default>
362
+ <show_in_website>1</show_in_website>
363
+ <show_in_store>1</show_in_store>
364
+ </trackinglink>
365
+ <suppress_domestic_tracking translate="label">
366
+ <label>Suppress Domestic Leg Tracking</label>
367
+ <frontend_type>select</frontend_type>
368
+ <sort_order>280</sort_order>
369
+ <frontend_class>shipping-skip-hide</frontend_class>
370
+ <source_model>adminhtml/system_config_source_yesno</source_model>
371
+ <show_in_default>1</show_in_default>
372
+ <show_in_website>1</show_in_website>
373
+ <show_in_store>1</show_in_store>
374
+ </suppress_domestic_tracking>
375
+ <custom_shipment_email_subject translate="label">
376
+ <label>Custom Shipment Email Subject</label>
377
+ <frontend_type>text</frontend_type>
378
+
379
+ <sort_order>281</sort_order>
380
+ <show_in_default>1</show_in_default>
381
+ <show_in_website>1</show_in_website>
382
+ <show_in_store>1</show_in_store>
383
+ </custom_shipment_email_subject>
384
+ <custom_shipment_email_template>
385
+ <label>Custom Shipment Email</label>
386
+ <frontend_type>textarea</frontend_type>
387
+ <sort_order>282</sort_order>
388
+ <show_in_default>1</show_in_default>
389
+ <show_in_website>1</show_in_website>
390
+ <show_in_store>1</show_in_store>
391
+ </custom_shipment_email_template>
392
+ <separate_log_file translate="label">
393
+ <label>Log in separate file</label>
394
+ <frontend_type>select</frontend_type>
395
+ <sort_order>283</sort_order>
396
+ <frontend_class>shipping-skip-hide</frontend_class>
397
+ <source_model>adminhtml/system_config_source_yesno</source_model>
398
+ <show_in_default>1</show_in_default>
399
+ <show_in_website>1</show_in_website>
400
+ <show_in_store>1</show_in_store>
401
+ </separate_log_file>
402
+ <return_address_street1 translate="label">
403
+ <label>Return Address Street 1</label>
404
+ <frontend_type>text</frontend_type>
405
+
406
+ <sort_order>284</sort_order>
407
+ <show_in_default>1</show_in_default>
408
+ <show_in_website>1</show_in_website>
409
+ <show_in_store>1</show_in_store>
410
+ </return_address_street1>
411
+ <return_address_city translate="label">
412
+ <label>Return Address City</label>
413
+ <frontend_type>text</frontend_type>
414
+
415
+ <sort_order>285</sort_order>
416
+ <show_in_default>1</show_in_default>
417
+ <show_in_website>1</show_in_website>
418
+ <show_in_store>1</show_in_store>
419
+ </return_address_city>
420
+ <return_address_state translate="label">
421
+ <label>Province/State</label>
422
+ <frontend_type>text</frontend_type>
423
+
424
+ <sort_order>286</sort_order>
425
+ <show_in_default>1</show_in_default>
426
+ <show_in_website>1</show_in_website>
427
+ <show_in_store>1</show_in_store>
428
+ </return_address_state>
429
+ <return_address_country translate="label">
430
+ <label>Country</label>
431
+ <frontend_type>select</frontend_type>
432
+ <source_model>adminhtml/system_config_source_country</source_model>
433
+ <sort_order>287</sort_order>
434
+ <show_in_default>1</show_in_default>
435
+ <show_in_website>1</show_in_website>
436
+ <show_in_store>1</show_in_store>
437
+ </return_address_country>
438
+ <return_address_zip translate="label">
439
+ <label>Zip or Postal Code</label>
440
+ <frontend_type>text</frontend_type>
441
+
442
+ <sort_order>288</sort_order>
443
+ <show_in_default>1</show_in_default>
444
+ <show_in_website>1</show_in_website>
445
+ <show_in_store>1</show_in_store>
446
+ </return_address_zip>
447
+ </fields>
448
+ </pbgsp>
449
+ </groups>
450
+ </carriers>
451
+
452
+ </sections>
453
+ </config>
app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php CHANGED
@@ -1,7 +1,7 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.1.2)
4
- * Packaged: 2015-09-23T12:09:53+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.2.0)
4
+ * Packaged: 2015-10-01T12:11:15+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.0.0-1.0.1.php CHANGED
@@ -1,7 +1,7 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.1.2)
4
- * Packaged: 2015-09-23T12:09:53+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.2.0)
4
+ * Packaged: 2015-10-01T12:11:15+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.1.1-1.1.2.php CHANGED
@@ -1,7 +1,7 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.1.2)
4
- * Packaged: 2015-09-23T12:09:53+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
@@ -20,9 +20,9 @@
20
 
21
  Alter TABLE {$this->getTable('pb_pbgsp/inboundparcel')} add `mage_order_shipment_number` varchar(50) null;
22
 
23
-
24
-
25
- ");
26
 
27
  $installer->endSetup();
28
  ?>
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.2.0)
4
+ * Packaged: 2015-10-01T12:11:15+00:00
5
  * Last Modified: 2015-09-14T12:11:20+00:00
6
 
7
 
20
 
21
  Alter TABLE {$this->getTable('pb_pbgsp/inboundparcel')} add `mage_order_shipment_number` varchar(50) null;
22
 
23
+
24
+ Alter TABLE {$this->getTable('pb_pbgsp/ordernumber')} add `original_shipping_address` varchar(150) null;
25
+ ");
26
 
27
  $installer->endSetup();
28
  ?>
app/locale/en_US/template/email/pbgsp_shipment_new.html CHANGED
@@ -1,12 +1,19 @@
1
-
2
- <h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;"">Hello, {{var customerName}}</h1>
3
  <p style="font-size:12px; line-height:16px; margin:0;">
4
- Thank you for your order from {{var storeName}}.
5
- You can check the status of your order by <a href="{{var customerAccountUrl}}" style="color:#1E7EC8;">logging into your account</a>.
6
 
7
  </p>
8
  <p style="font-size:12px; line-height:16px; margin:0;">
9
  Your shipping confirmation is below. Thank you again for your business.
10
- </p>
 
 
 
 
 
 
 
11
 
12
- <h2 style="font-size:18px; font-weight:normal; margin:0;">Your Order #{{var orderNumber}} has been shipped from local warehouse to international shipment hub from where it will be shipped to your country.</h2>
 
1
+ <h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;"">Hello, {{htmlescape var=$order.getCustomerName()}}</h1>
 
2
  <p style="font-size:12px; line-height:16px; margin:0;">
3
+ Thank you for your order from {{var store.getFrontendName()}}.
4
+ You can check the status of your order by <a href="{{store url="customer/account/"}}" style="color:#1E7EC8;">logging into your account</a>.
5
 
6
  </p>
7
  <p style="font-size:12px; line-height:16px; margin:0;">
8
  Your shipping confirmation is below. Thank you again for your business.
9
+ </p></br>
10
+
11
+ <h4 style="font-size:18px; font-weight:normal; margin:0;">Your Order #{{var order.increment_id}} is being shipped via Pitney Bowes to the following address
12
+ </h4>
13
+ <p>
14
+ {{var order.getShippingAddress().format('html')}} </p>
15
+
16
+ <b><i>Note: The above shipping address is not the final shipping address but it is the distribution hub address that the parcel will be sent out internationally</i></b>
17
 
18
+
19
+
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>pitneybowes_gsp</name>
4
- <version>1.1.2</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License (OSL)</license>
7
  <channel>community</channel>
@@ -24,14 +24,16 @@ To learn more, go to &lt;a href="http://www.pb.com/ecom"&gt;http://www.pb.com/ec
24
  </description>
25
  <notes>Patch release for Magento Connect.&#xD;
26
  &#xD;
27
- 1. Integrated validation for title field in configuration page to resolve PHP 5.3 will warning when there is an empty string&#xD;
28
  &#xD;
29
- 2. Added a cron job to check for shipped PB orders that have no ASNs (tracking numbers) and attempt to create.&#xD;
 
 
30
  </notes>
31
  <authors><author><name>Raymond Lai</name><user>r3lai</user><email>raymond.lai@pb.com</email></author></authors>
32
- <date>2015-09-23</date>
33
- <time>09:12:23</time>
34
- <contents><target name="magelocal"><dir name="Pb"><dir name="Pbgsp"><dir name="Block"><dir name="Adminhtml"><dir name="Sales"><dir name="Order"><dir name="Invoice"><file name="Totals.php" hash="8ab84a0f0cb90a789c070c56a8aa98a6"/></dir><file name="Totals.php" hash="1e8e96536ee19bb5dd63ab6eda700643"/></dir></dir></dir><dir name="Checkout"><dir name="Shipping"><dir name="Method"><file name="Available.php" hash="af424c7537c48e18fe6263d74c54e1fe"/></dir></dir></dir><file name="Form.php" hash="58e83cab0de71d6cc5afec9a60afd09c"/><dir name="Sales"><dir name="Order"><dir name="Invoice"><file name="Totals.php" hash="9338271819f701d9d5c262bf1169309c"/></dir><file name="Totals.php" hash="637038d37fd4177cd6709d446bc9b3af"/></dir></dir></dir><dir name="Model"><file name="Api.php" hash="742f69113031ce0634221c3984f72de8"/><file name="Authapioptions.php" hash="8cd4e0e89c1bc6b5ca12d502386c89a2"/><dir name="Carrier"><file name="ShippingMethod.php" hash="23731ef28af943b98882a578806a7dce"/></dir><dir name="Catalog"><file name="Category.php" hash="2e5ccc49d8db68b842e55f17a3133bed"/><file name="Cron.php" hash="2e6558d7ef8f1eb67e698c01cdbbf443"/><file name="File.php" hash="802a1e04cdcbfa03c751134967ee8d97"/><file name="Product.php" hash="be61ca172bea55d211378e115094412c"/></dir><file name="Credentials.php" hash="e803b610c868d6fab41453181d6601b7"/><dir name="Creditmemo"><file name="Duty.php" hash="b9386a05a58fec625a882124b7b7eaaf"/></dir><file name="Handlingoptions.php" hash="9fd861980e227ee515c3fa5b1d1c4367"/><file name="Helper.php" hash="b593554885558b7869b061531c9f4635"/><file name="Inboundparcel.php" hash="6e8359494a8835920af4fc9952da4fd8"/><dir name="Invoice"><file name="Duty.php" hash="746f327895d0a17d20d254cb734bebe9"/></dir><file name="Messages.php" hash="050a5919049d5c1384a199d7c74e684e"/><dir name="Mysql4"><dir name="Inboundparcel"><file name="Collection.php" hash="b69d5f58ae74f5e0c5e0795bc05cd634"/></dir><file name="Inboundparcel.php" hash="88086d87454e4387ac06e2122b014aa0"/><dir name="Ordernumber"><file name="Collection.php" hash="25f36a5eda8d948af55a71714600f899"/></dir><file name="Ordernumber.php" hash="1090339fc2d318bc8e3cf584e3eae613"/><dir name="Variable"><file name="Collection.php" hash="f4adfab8b49a87146790c086732b3c61"/></dir><file name="Variable.php" hash="c4eb21689279b74abdb0bc8ddc7b8bf3"/></dir><file name="Observer.php" hash="2780be538ad88d58f3c051189324832c"/><file name="Ordernumber.php" hash="503d6eaee5d7b8a5d2864ce89278d5be"/><dir name="Pdf"><file name="Tax.php" hash="808dfb5b91f55f988f56f81efbe5a60f"/></dir><dir name="Quote"><file name="Duty.php" hash="9498d9f2139c3cd1efd6fa09a797a9ca"/></dir><dir name="Resource"><dir name="Mysql4"><file name="Setup.php" hash="390c18c3ac49dcb2e58c02e008bfabf3"/></dir></dir><dir name="Sales"><dir name="Order"><file name="Shipment.php" hash="d539276b76e18e29650e752e90cca8c8"/></dir></dir><file name="Util.php" hash="fab2ec90f3811b9d06e82d846d9a677e"/><file name="Variable.php" hash="726abe7a2799e908c533e2291e6c2731"/></dir><dir name="data"><dir name="pb_pbgsp_setup"><file name="data-install-1.0.0.php" hash="acc1c1d2b3bd26a689a16362e17e6156"/></dir></dir><dir name="etc"><file name="config.xml" hash="5eb8e33a378e9efca63147a53842789e"/><file name="system.xml" hash="d5903ba4e10cf079e83c630ee64915fd"/></dir><dir name="sql"><dir name="pbgsp_setup"><file name="mysql4-install-1.0.0.php" hash="83386f7fcdfeff8ab43c97604584d977"/><file name="mysql4-upgrade-1.0.0-1.0.1.php" hash="a10ace43727a9c10b8a1a7299dfc32db"/><file name="mysql4-upgrade-1.1.1-1.1.2.php" hash="f6e63f3b2d72f949039e4a9b8141215c"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Pb_Pbgsp.xml" hash="8475d60d4719f8ea7761a4ca39016e48"/></dir></target><target name="magelocale"><dir name="en_US"><file name="Pb_Clearpath.csv" hash="aa4b7a650feb1709a34b6c053b56811c"/><dir name="template"><dir name="email"><file name="pbgsp_shipment_new.html" hash="2cc5cdbeaa719f4dab6a7c9e29fd6574"/></dir></dir></dir></target><target name="mageweb"><dir name="."><file name="ReadMe.txt" hash="9d657805471840b8eeba8c2c5e84870c"/></dir></target></contents>
35
  <compatible/>
36
  <dependencies><required><php><min>5.1.0</min><max>5.6.0</max></php></required></dependencies>
37
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>pitneybowes_gsp</name>
4
+ <version>1.2.0</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License (OSL)</license>
7
  <channel>community</channel>
24
  </description>
25
  <notes>Patch release for Magento Connect.&#xD;
26
  &#xD;
27
+ 1. Add config option to override domestic shipping address with PB HUB address. When active the PB domestic HUB address will overwrite the customer shipping address for the order. The customer shipping address is stored with PB and also added to the order details for record keeping.&#xD;
28
  &#xD;
29
+ 2. move the product weight value into the COMMODITY_WEIGHT column on the CSV catalog exports.&#xD;
30
+ &#xD;
31
+ 3. add logic to separate free shipping and tax. Now each work independently of one another where before enabling free shipping also made tax 0.00&#xD;
32
  </notes>
33
  <authors><author><name>Raymond Lai</name><user>r3lai</user><email>raymond.lai@pb.com</email></author></authors>
34
+ <date>2015-10-01</date>
35
+ <time>15:28:02</time>
36
+ <contents><target name="magelocal"><dir name="Pb"><dir name="Pbgsp"><dir name="Block"><dir name="Adminhtml"><dir name="Sales"><dir name="Order"><dir name="Invoice"><file name="Totals.php" hash="5ce882672363553e1b0c838a2409ac5d"/></dir><file name="Totals.php" hash="a35007f55c145745a23f3cc286772eac"/></dir></dir></dir><dir name="Checkout"><dir name="Shipping"><dir name="Method"><file name="Available.php" hash="91bbaef02fdb070f4cc97f64e7d11486"/></dir></dir></dir><file name="Form.php" hash="b5f9030fdc10945cbe43c9bb4a731fdf"/><dir name="Sales"><dir name="Order"><dir name="Invoice"><file name="Totals.php" hash="46d5bcaf29baf4dfab6b21ea9ee25cf4"/></dir><file name="Totals.php" hash="7bd90a4e149f6566cab5434bfe14b699"/></dir></dir></dir><dir name="Model"><file name="Api.php" hash="c5472b8a682ad7f003f113514c10850b"/><file name="Authapioptions.php" hash="8cd4e0e89c1bc6b5ca12d502386c89a2"/><dir name="Carrier"><file name="ShippingMethod.php" hash="9c46c80a76571c9b591cfcf014e0f254"/></dir><dir name="Catalog"><file name="Category.php" hash="5d4a36a6b07ed2a233982663cebfd419"/><file name="Cron.php" hash="647673ce41b54b555a3ac2200ee4ac36"/><file name="File.php" hash="76892d379e2955460befe40d35b912b9"/><file name="Product.php" hash="a6bba0ce98d501d4a00bd497610bb64f"/></dir><file name="Credentials.php" hash="fd008d81b954f4922d79474ae2bb07d2"/><dir name="Creditmemo"><file name="Duty.php" hash="99d4d8781551842be44f39bd578d42a7"/></dir><file name="Handlingoptions.php" hash="9a2d7a9f07a0a23f543ee0bd904e4323"/><file name="Helper.php" hash="dabc03dd78b922f42143855a3c4f3ae6"/><file name="Inboundparcel.php" hash="07fcc814ef35222f8a2d2c7c13f597e4"/><dir name="Invoice"><file name="Duty.php" hash="6dbf7aeeb278d82a99b7f60f8e85ac4c"/></dir><file name="Messages.php" hash="870038a8fa7411791110e65432d4f02f"/><dir name="Mysql4"><dir name="Inboundparcel"><file name="Collection.php" hash="172aa49651d75e986db609d0c04106c7"/></dir><file name="Inboundparcel.php" hash="e37c4f29066efffa083cccd1a2abc229"/><dir name="Ordernumber"><file name="Collection.php" hash="9d60c6951e77b7c8b59a985fb8f21172"/></dir><file name="Ordernumber.php" hash="946ae2660200c7f9139224fbe160eb5f"/><dir name="Variable"><file name="Collection.php" hash="8228083570074b7b54620d34cf9c032d"/></dir><file name="Variable.php" hash="60d9f3db7d75e04193aeb311296ad836"/></dir><file name="Observer.php" hash="8602dd4258e06f77f04a7a020edffd25"/><file name="Ordernumber.php" hash="d439ac7a2a7a4a0a4fa4e78aafe94e92"/><dir name="Pdf"><file name="Tax.php" hash="a9f5329cb677db0fda251b755bf7d74d"/></dir><dir name="Quote"><file name="Duty.php" hash="05a460c169af1dfca0bce39bfdf522e6"/></dir><dir name="Resource"><dir name="Mysql4"><file name="Setup.php" hash="a901bd7daee17eb1ec8beecc4cc9f22e"/></dir></dir><dir name="Sales"><dir name="Order"><file name="Shipment.php" hash="6372266b94eea6a50504f28e444c279b"/></dir></dir><dir name="System"><dir name="Config"><dir name="Backend"><dir name="Serialized"><dir name="Array"><file name="Priority.php" hash="26e62a8cc666a3ad4876863d3a89eca6"/></dir></dir></dir><dir name="Source"><file name="Asn.php" hash="e47d7eb5b42b936ee52eaedd5647f346"/><file name="Auth.php" hash="0b957b35f4d4f0746811447bf895b6b8"/><file name="Checkout.php" hash="63dc3a4a4743c960c28ab137bce515b0"/><file name="Sftp.php" hash="de167bb7276da8899d3c648c20ed0acc"/></dir></dir></dir><file name="Util.php" hash="08858ef4863928a31c40309daeddd3fd"/><file name="Variable.php" hash="1256e55a85b2a7aa2f2a5bb23d3f1ca4"/></dir><dir name="data"><dir name="pb_pbgsp_setup"><file name="data-install-1.0.0.php" hash="2a7a7186e47cca46164599ad15e00c7f"/></dir></dir><dir name="etc"><file name="config.xml" hash="ff7a3347e1be6c973af7ca149ca801a2"/><file name="system.xml" hash="0b67613ddbc669a867af51c2056171fa"/><file name="system.xml_bk" hash="66ab74c09711ce8ff5a75ba80688c194"/></dir><dir name="sql"><dir name="pbgsp_setup"><file name="mysql4-install-1.0.0.php" hash="7d29de4c891630b7bc28867538b4749a"/><file name="mysql4-upgrade-1.0.0-1.0.1.php" hash="791392a6a2b0759eadfe9fba72af44ce"/><file name="mysql4-upgrade-1.1.1-1.1.2.php" hash="c932eddda209bcd75153902334802ea8"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Pb_Pbgsp.xml" hash="8475d60d4719f8ea7761a4ca39016e48"/></dir></target><target name="magelocale"><dir name="en_US"><file name="Pb_Clearpath.csv" hash="aa4b7a650feb1709a34b6c053b56811c"/><dir name="template"><dir name="email"><file name="pbgsp_shipment_new.html" hash="0fb628e37654a9768babe0ed06df4960"/></dir></dir></dir></target><target name="mageweb"><dir name="."><file name="ReadMe.txt" hash="bc1d61fecfbacacbb5d4a18a9082fc50"/></dir></target></contents>
37
  <compatible/>
38
  <dependencies><required><php><min>5.1.0</min><max>5.6.0</max></php></required></dependencies>
39
  </package>