pitneybowes_gsp - Version 1.4.1

Version Notes

1 add "lbs." with Package Weight.
2 add (in.) to length related fields
3 Fixed Group Permission issue in Magento role editor
4 Removed the "no-reply@pb.com" email as it was causing relay errors on some installations
5 Changed catalog export CSV to have line endings with CRLF
6 Add tracking url update to use newer https://parceltracking.pb.com URL
7 Add condition to allow for tracking link to be added to custom shipment email. Add following code to custom email template to include a link in the transaction: (Track your order from here.)
8 Update shipping email template to include tracking link to new pb shipping tool
9 Add a delay in sending shipment notification to ensure the process isn’t triggered before PB system updates (5 minutes)
10 Fixed an issue of missing Package_Weight column in catalog export file

Download this release

Release Info

Developer Shane Bogdan
Extension pitneybowes_gsp
Version 1.4.1
Comparing to
See all releases


Code changes from version 1.4.0 to 1.4.1

Files changed (58) hide show
  1. app/code/local/Pb/Pbgsp/Block/Adminhtml/Categorysettings.php +3 -3
  2. app/code/local/Pb/Pbgsp/Block/Adminhtml/Categorysettings/Grid.php +3 -3
  3. app/code/local/Pb/Pbgsp/Block/Adminhtml/Sales/Order/Invoice/Totals.php +3 -3
  4. app/code/local/Pb/Pbgsp/Block/Adminhtml/Sales/Order/Totals.php +3 -3
  5. app/code/local/Pb/Pbgsp/Block/Adminhtml/Version.php +3 -3
  6. app/code/local/Pb/Pbgsp/Block/Checkout/Shipping/Method/Available.php +3 -3
  7. app/code/local/Pb/Pbgsp/Block/Form.php +3 -3
  8. app/code/local/Pb/Pbgsp/Block/Sales/Order/Invoice/Totals.php +3 -3
  9. app/code/local/Pb/Pbgsp/Block/Sales/Order/Totals.php +3 -3
  10. app/code/local/Pb/Pbgsp/Block/Tax/Checkout/Tax.php +3 -3
  11. app/code/local/Pb/Pbgsp/Helper/Data.php +3 -3
  12. app/code/local/Pb/Pbgsp/Model/Api.php +3 -3
  13. app/code/local/Pb/Pbgsp/Model/Carrier/ShippingMethod.php +3 -3
  14. app/code/local/Pb/Pbgsp/Model/Catalog/Category.php +5 -3
  15. app/code/local/Pb/Pbgsp/Model/Catalog/Cron.php +3 -3
  16. app/code/local/Pb/Pbgsp/Model/Catalog/File.php +9 -7
  17. app/code/local/Pb/Pbgsp/Model/Catalog/Product.php +16 -14
  18. app/code/local/Pb/Pbgsp/Model/Credentials.php +3 -3
  19. app/code/local/Pb/Pbgsp/Model/Creditmemo/Duty.php +3 -3
  20. app/code/local/Pb/Pbgsp/Model/Environmentconfig.php +3 -3
  21. app/code/local/Pb/Pbgsp/Model/Handledata.php +3 -3
  22. app/code/local/Pb/Pbgsp/Model/Handlingoptions.php +3 -3
  23. app/code/local/Pb/Pbgsp/Model/Helper.php +3 -3
  24. app/code/local/Pb/Pbgsp/Model/Inboundparcel.php +3 -3
  25. app/code/local/Pb/Pbgsp/Model/Invoice/Duty.php +3 -3
  26. app/code/local/Pb/Pbgsp/Model/Messages.php +3 -3
  27. app/code/local/Pb/Pbgsp/Model/Mysql4/Inboundparcel.php +3 -3
  28. app/code/local/Pb/Pbgsp/Model/Mysql4/Inboundparcel/Collection.php +3 -3
  29. app/code/local/Pb/Pbgsp/Model/Mysql4/Ordernumber.php +3 -3
  30. app/code/local/Pb/Pbgsp/Model/Mysql4/Ordernumber/Collection.php +3 -3
  31. app/code/local/Pb/Pbgsp/Model/Mysql4/Shipmentemail.php +16 -0
  32. app/code/local/Pb/Pbgsp/Model/Mysql4/Shipmentemail/Collection.php +15 -0
  33. app/code/local/Pb/Pbgsp/Model/Mysql4/Variable.php +3 -3
  34. app/code/local/Pb/Pbgsp/Model/Mysql4/Variable/Collection.php +3 -3
  35. app/code/local/Pb/Pbgsp/Model/Newhandlingoptions.php +3 -3
  36. app/code/local/Pb/Pbgsp/Model/Observer.php +7 -6
  37. app/code/local/Pb/Pbgsp/Model/Ordernumber.php +3 -3
  38. app/code/local/Pb/Pbgsp/Model/Pdf/Tax.php +3 -3
  39. app/code/local/Pb/Pbgsp/Model/Productattributesource/Productconditions.php +3 -3
  40. app/code/local/Pb/Pbgsp/Model/Quote/Duty.php +3 -3
  41. app/code/local/Pb/Pbgsp/Model/Resource/Mysql4/Setup.php +3 -3
  42. app/code/local/Pb/Pbgsp/Model/Sales/Order/Shipment.php +51 -8
  43. app/code/local/Pb/Pbgsp/Model/Shipmentemail.php +28 -0
  44. app/code/local/Pb/Pbgsp/Model/Util.php +48 -3
  45. app/code/local/Pb/Pbgsp/Model/Variable.php +3 -3
  46. app/code/local/Pb/Pbgsp/controllers/Adminhtml/CategorysettingsController.php +3 -3
  47. app/code/local/Pb/Pbgsp/data/pb_pbgsp_setup/data-install-1.0.0.php +3 -3
  48. app/code/local/Pb/Pbgsp/etc/adminhtml.xml +23 -0
  49. app/code/local/Pb/Pbgsp/etc/config.xml +13 -16
  50. app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php +3 -3
  51. app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.0.0-1.0.1.php +3 -3
  52. app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.1.1-1.1.2.php +3 -3
  53. app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.2.0-1.2.1.php +3 -3
  54. app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.3.0-1.3.1.php +3 -3
  55. app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.3.5-1.3.6.php +3 -3
  56. app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.4.0-1.4.1.php +47 -0
  57. app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.4.1-1.4.2.php +31 -0
  58. package.xml +14 -8
app/code/local/Pb/Pbgsp/Block/Adminhtml/Categorysettings.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.4.0)
4
- * Packaged: 2016-07-28T17:25:00+00:00
5
- * Last Modified: 2016-07-26T14:17:00+00:00
6
  */
7
 
8
  class Pb_Pbgsp_Block_Adminhtml_Categorysettings extends Mage_Adminhtml_Block_Widget_Grid_Container {
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.4.1)
4
+ * Packaged: 2016-07-26T14:25:00+00:00
5
+ * Last Modified: 2016-09-13T10:50:00+00:00
6
  */
7
 
8
  class Pb_Pbgsp_Block_Adminhtml_Categorysettings extends Mage_Adminhtml_Block_Widget_Grid_Container {
app/code/local/Pb/Pbgsp/Block/Adminhtml/Categorysettings/Grid.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.4.0)
4
- * Packaged: 2016-07-28T17:25:00+00:00
5
- * Last Modified: 2016-07-26T14:17:00+00:00
6
  */
7
 
8
  class Pb_Pbgsp_Block_Adminhtml_Categorysettings_Grid extends Mage_Adminhtml_Block_Widget_Grid {
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.4.1)
4
+ * Packaged: 2016-07-26T14:25:00+00:00
5
+ * Last Modified: 2016-09-13T10:50:00+00:00
6
  */
7
 
8
  class Pb_Pbgsp_Block_Adminhtml_Categorysettings_Grid extends Mage_Adminhtml_Block_Widget_Grid {
app/code/local/Pb/Pbgsp/Block/Adminhtml/Sales/Order/Invoice/Totals.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.4.0)
4
- * Packaged: 2016-07-28T17:25:00+00:00
5
- * Last Modified: 2016-07-26T14:17:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Block/Adminhtml/Sales/Order/Invoice/Totals.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.4.1)
4
+ * Packaged: 2016-07-26T14:25:00+00:00
5
+ * Last Modified: 2016-09-13T10:50:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Block/Adminhtml/Sales/Order/Invoice/Totals.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/Block/Adminhtml/Sales/Order/Totals.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.4.0)
4
- * Packaged: 2016-07-28T17:25:00+00:00
5
- * Last Modified: 2016-07-26T14:17:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Block/Adminhtml/Sales/Order/Totals.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.4.1)
4
+ * Packaged: 2016-07-26T14:25:00+00:00
5
+ * Last Modified: 2016-09-13T10:50:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Block/Adminhtml/Sales/Order/Totals.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/Block/Adminhtml/Version.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.4.0)
4
- * Packaged: 2016-07-28T17:25:00+00:00
5
- * Last Modified: 2016-07-26T14:17:00+00:00
6
 
7
 
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.4.1)
4
+ * Packaged: 2016-07-26T14:25:00+00:00
5
+ * Last Modified: 2016-09-13T10:50:00+00:00
6
 
7
 
8
  */
app/code/local/Pb/Pbgsp/Block/Checkout/Shipping/Method/Available.php CHANGED
@@ -1,9 +1,9 @@
1
  <?php
2
 
3
  /**
4
- * Product: Pb_Pbgsp (1.4.0)
5
- * Packaged: 2016-07-28T17:25:00+00:00
6
- * Last Modified: 2016-07-26T14:17:00+00:00
7
  * File: app/code/local/Pb/Pbgsp/Block/Checkout/Shipping/Method/Available.php
8
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
9
  */
1
  <?php
2
 
3
  /**
4
+ * Product: Pb_Pbgsp (1.4.1)
5
+ * Packaged: 2016-07-26T14:25:00+00:00
6
+ * Last Modified: 2016-09-13T10:50:00+00:00
7
  * File: app/code/local/Pb/Pbgsp/Block/Checkout/Shipping/Method/Available.php
8
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
9
  */
app/code/local/Pb/Pbgsp/Block/Form.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.4.0)
4
- * Packaged: 2016-07-28T17:25:00+00:00
5
- * Last Modified: 2016-07-26T14:17:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Block/Form.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.4.1)
4
+ * Packaged: 2016-07-26T14:25:00+00:00
5
+ * Last Modified: 2016-09-13T10:50:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Block/Form.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/Block/Sales/Order/Invoice/Totals.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.4.0)
4
- * Packaged: 2016-07-28T17:25:00+00:00
5
- * Last Modified: 2016-07-26T14:17:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Block/Sales/Order/Invoice/Totals.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.4.1)
4
+ * Packaged: 2016-07-26T14:25:00+00:00
5
+ * Last Modified: 2016-09-13T10:50:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Block/Sales/Order/Invoice/Totals.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/Block/Sales/Order/Totals.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.4.0)
4
- * Packaged: 2016-07-28T17:25:00+00:00
5
- * Last Modified: 2016-07-26T14:17:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Block/Sales/Order/Totals.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.4.1)
4
+ * Packaged: 2016-07-26T14:25:00+00:00
5
+ * Last Modified: 2016-09-13T10:50:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Block/Sales/Order/Totals.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/Block/Tax/Checkout/Tax.php CHANGED
@@ -1,9 +1,9 @@
1
  <?php
2
 
3
  /**
4
- * Product: Pb_Pbgsp (1.4.0)
5
- * Packaged: 2016-07-28T17:25:00+00:00
6
- * Last Modified: 2016-07-26T14:17:00+00:00
7
  */
8
  class Pb_Pbgsp_Block_Tax_Checkout_Tax extends Mage_Tax_Block_Checkout_Tax
9
  {
1
  <?php
2
 
3
  /**
4
+ * Product: Pb_Pbgsp (1.4.1)
5
+ * Packaged: 2016-07-26T14:25:00+00:00
6
+ * Last Modified: 2016-09-13T10:50:00+00:00
7
  */
8
  class Pb_Pbgsp_Block_Tax_Checkout_Tax extends Mage_Tax_Block_Checkout_Tax
9
  {
app/code/local/Pb/Pbgsp/Helper/Data.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.4.0)
4
- * Packaged: 2016-07-28T17:25:00+00:00
5
- * Last Modified: 2016-07-26T14:17:00+00:00
6
 
7
  */
8
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.4.1)
4
+ * Packaged: 2016-07-26T14:25:00+00:00
5
+ * Last Modified: 2016-09-13T10:50:00+00:00
6
 
7
  */
8
 
app/code/local/Pb/Pbgsp/Model/Api.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.3)
4
- * Packaged: 2016-02-23T11:12:30+00:00
5
- * Last Modified: 2016-01-11T11:12:49+00:00
6
 
7
 
8
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.4.1)
4
+ * Packaged: 2016-07-26T14:25:00+00:00
5
+ * Last Modified: 2016-09-13T10:50:00+00:00
6
 
7
 
8
 
app/code/local/Pb/Pbgsp/Model/Carrier/ShippingMethod.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.4.0)
4
- * Packaged: 2016-07-28T17:25:00+00:00
5
- * Last Modified: 2016-07-26T14:17:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Carrier/ShippingMethod.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.4.1)
4
+ * Packaged: 2016-07-26T14:25:00+00:00
5
+ * Last Modified: 2016-09-13T10:50:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Carrier/ShippingMethod.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/Model/Catalog/Category.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.4.0)
4
- * Packaged: 2016-07-28T17:25:00+00:00
5
- * Last Modified: 2016-07-26T14:17:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Catalog/Category.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
@@ -86,6 +86,8 @@ class Pb_Pbgsp_Model_Catalog_Category {
86
  $parentCateID = $this->getParentCode();
87
  }
88
  fputcsv($file,array($this->getCode(),$parentCateID,$name,'',$this->getUrl()));
 
 
89
  return true;
90
  }
91
  return false;
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.4.1)
4
+ * Packaged: 2016-07-26T14:25:00+00:00
5
+ * Last Modified: 2016-09-13T10:50:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Catalog/Category.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
86
  $parentCateID = $this->getParentCode();
87
  }
88
  fputcsv($file,array($this->getCode(),$parentCateID,$name,'',$this->getUrl()));
89
+ fseek($file, -1, SEEK_CUR);
90
+ fwrite($file, "\r\n");
91
  return true;
92
  }
93
  return false;
app/code/local/Pb/Pbgsp/Model/Catalog/Cron.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.4.0)
4
- * Packaged: 2016-07-28T17:25:00+00:00
5
- * Last Modified: 2016-07-26T14:17:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Catalog/Cron.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.4.1)
4
+ * Packaged: 2016-07-26T14:25:00+00:00
5
+ * Last Modified: 2016-09-13T10:50:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Catalog/Cron.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/Model/Catalog/File.php CHANGED
@@ -1,9 +1,9 @@
1
  <?php
2
 
3
  /**
4
- * Product: Pb_Pbgsp (1.4.0)
5
- * Packaged: 2016-07-28T17:25:00+00:00
6
- * Last Modified: 2016-07-26T14:17:00+00:00
7
  * File: app/code/local/Pb/Pbgsp/Model/Catalog/File.php
8
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
9
  */
@@ -60,11 +60,12 @@ 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_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
  }
70
  private function _createNewCategoryFile($part=null) {
@@ -77,7 +78,8 @@ class Pb_Pbgsp_Model_Catalog_File {
77
  //add header row
78
  fputcsv($this->file,array('CATEGORY_ID','PARENT_CATEGORY_ID','NAME',
79
  'ID_PATH','URL'));
80
-
 
81
  fflush($this->file);
82
  }
83
 
@@ -500,7 +502,7 @@ class Pb_Pbgsp_Model_Catalog_File {
500
  $notificationFiles = array_diff(scandir($notificationDir), array('..', '.'));
501
  if(count($notificationFiles) > 0) {
502
  $mail = new Zend_Mail();
503
- $mail->setFrom('no-reply@pb.com','Pitney Bowes');
504
  $subject = 'Catalog Export Results';
505
  $mail->addTo($adminEmail)
506
 
1
  <?php
2
 
3
  /**
4
+ * Product: Pb_Pbgsp (1.4.1)
5
+ * Packaged: 2016-07-26T14:25:00+00:00
6
+ * Last Modified: 2016-09-13T10:50:00+00:00
7
  * File: app/code/local/Pb/Pbgsp/Model/Catalog/File.php
8
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
9
  */
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','COMMODITY_WEIGHT'));//,'RH_CATEGORY_URL_PATH','GPC','COMMODITY_WEIGHT','HS_CODE','CURRENCY'
67
+ fseek($this->file, -1, SEEK_CUR);
68
+ fwrite($this->file, "\r\n");
69
  fflush($this->file);
70
  }
71
  private function _createNewCategoryFile($part=null) {
78
  //add header row
79
  fputcsv($this->file,array('CATEGORY_ID','PARENT_CATEGORY_ID','NAME',
80
  'ID_PATH','URL'));
81
+ fseek($this->file, -1, SEEK_CUR);
82
+ fwrite($this->file, "\r\n");
83
  fflush($this->file);
84
  }
85
 
502
  $notificationFiles = array_diff(scandir($notificationDir), array('..', '.'));
503
  if(count($notificationFiles) > 0) {
504
  $mail = new Zend_Mail();
505
+ //$mail->setFrom('no-reply@pb.com','Pitney Bowes');
506
  $subject = 'Catalog Export Results';
507
  $mail->addTo($adminEmail)
508
 
app/code/local/Pb/Pbgsp/Model/Catalog/Product.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.4.0)
4
- * Packaged: 2016-07-28T17:25:00+00:00
5
- * Last Modified: 2016-07-26T14:17:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Catalog/Product.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
@@ -143,16 +143,7 @@ class Pb_Pbgsp_Model_Catalog_Product {
143
  }
144
 
145
 
146
- // fputcsv($this->file,array('MERCHANT_COMMODITY_REF_ID','COMMODITY_NAME_TITLE','SHORT_DESCRIPTION',
147
- // 'LONG_DESCRIPTION','RETAILER_ID','COMMODITY_URL','RETAILER_UNIQUE_ID','PCH_CATEGORY_ID',
148
- // 'RH_CATEGORY_ID','STANDARD_PRICE','WEIGHT_UNIT','DISTANCE_UNIT','COO','IMAGE_URL','PARENT_SKU',
149
- // 'CHILD_SKU','PARCELS_PER_SKU','UPC','UPC_CHECK_DIGIT','GTIN','MPN','ISBN','BRAND','MANUFACTURER',
150
- // 'MODEL_NUMBER','MANUFACTURER_STOCK_NUMBER','COMMODITY_CONDITION','COMMODITY_HEIGHT',
151
- // 'COMMODITY_WIDTH','COMMODITY_LENGTH','PACKAGE_WEIGHT','PACKAGE_HEIGHT','PACKAGE_WIDTH',
152
- // 'PACKAGE_LENGTH','HAZMAT','ORMD','CHEMICAL_INDICATOR','PESTICIDE_INDICATOR','AEROSOL_INDICATOR',
153
- // 'RPPC_INDICATOR','BATTERY_TYPE','NON_SPILLABLE_BATTERY','FUEL_RESTRICTION','SHIP_ALONE',
154
- // 'RH_CATEGORY_ID_PATH','RH_CATEGORY_NAME_PATH','RH_CATEGORY_URL_PATH','GPC','COMMODITY_WEIGHT',
155
- // 'HS_CODE','CURRENCY'));
156
  $merchantCode = Pb_Pbgsp_Model_Credentials::getMerchantCode();
157
  if($this -> getWeight() == 0)
158
  {
@@ -188,15 +179,26 @@ class Pb_Pbgsp_Model_Catalog_Product {
188
  if($this->product->getPbPbgspPackageLength() > 0) {
189
  $packageLength = $this->product->getPbPbgspPackageLength();
190
  }
 
 
 
 
 
 
 
 
 
191
  fputcsv($file,array($this -> getSKU(),$name,$shortDescription,$description,$merchantCode,$this -> getURL(),$merchantCode,'',$categoryCode,$this->getPrice(),'lb','',$this->getCountryOfOrigin(),'','',
192
  '','','','','','','','','',
193
  '','',$this->getProductCondition(),$commodityHeight,
194
  $commodityWidth,$commodityLength,$packageWeight,$packageHeight,$packageWidth,
195
  $packageLength,'','','','','',
196
- '','','','',
197
  strval($category->getData('id_path')),$category->getData('name_path'),$weight
198
  //,'','','','',$category->getData('store')->getCurrentCurrencyCode()
199
  ));
 
 
200
  //fwrite($file, $string);
201
  }
202
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.4.1)
4
+ * Packaged: 2016-07-26T14:25:00+00:00
5
+ * Last Modified: 2016-09-13T10:50:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Catalog/Product.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
143
  }
144
 
145
 
146
+
 
 
 
 
 
 
 
 
 
147
  $merchantCode = Pb_Pbgsp_Model_Credentials::getMerchantCode();
148
  if($this -> getWeight() == 0)
149
  {
179
  if($this->product->getPbPbgspPackageLength() > 0) {
180
  $packageLength = $this->product->getPbPbgspPackageLength();
181
  }
182
+ // fputcsv($this->file,array('MERCHANT_COMMODITY_REF_ID','COMMODITY_NAME_TITLE','SHORT_DESCRIPTION',
183
+ // 'LONG_DESCRIPTION','RETAILER_ID','COMMODITY_URL','RETAILER_UNIQUE_ID','PCH_CATEGORY_ID',
184
+ // 'RH_CATEGORY_ID','STANDARD_PRICE','WEIGHT_UNIT','DISTANCE_UNIT','COO','IMAGE_URL','PARENT_SKU',
185
+ // 'CHILD_SKU','PARCELS_PER_SKU','UPC','UPC_CHECK_DIGIT','GTIN','MPN','ISBN','BRAND','MANUFACTURER',
186
+ // 'MODEL_NUMBER','MANUFACTURER_STOCK_NUMBER','COMMODITY_CONDITION','COMMODITY_HEIGHT',
187
+ // 'COMMODITY_WIDTH','COMMODITY_LENGTH','PACKAGE_WEIGHT','PACKAGE_HEIGHT','PACKAGE_WIDTH',
188
+ // 'PACKAGE_LENGTH','HAZMAT','ORMD','CHEMICAL_INDICATOR','PESTICIDE_INDICATOR','AEROSOL_INDICATOR',
189
+ // 'RPPC_INDICATOR','BATTERY_TYPE','NON_SPILLABLE_BATTERY','FUEL_RESTRICTION','SHIP_ALONE',
190
+ // 'RH_CATEGORY_ID_PATH','RH_CATEGORY_NAME_PATH','COMMODITY_WEIGHT'));
191
  fputcsv($file,array($this -> getSKU(),$name,$shortDescription,$description,$merchantCode,$this -> getURL(),$merchantCode,'',$categoryCode,$this->getPrice(),'lb','',$this->getCountryOfOrigin(),'','',
192
  '','','','','','','','','',
193
  '','',$this->getProductCondition(),$commodityHeight,
194
  $commodityWidth,$commodityLength,$packageWeight,$packageHeight,$packageWidth,
195
  $packageLength,'','','','','',
196
+ '','','','','',
197
  strval($category->getData('id_path')),$category->getData('name_path'),$weight
198
  //,'','','','',$category->getData('store')->getCurrentCurrencyCode()
199
  ));
200
+ fseek($file, -1, SEEK_CUR);
201
+ fwrite($file, "\r\n");
202
  //fwrite($file, $string);
203
  }
204
 
app/code/local/Pb/Pbgsp/Model/Credentials.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.4.0)
4
- * Packaged: 2016-07-28T17:25:00+00:00
5
- * Last Modified: 2016-07-26T14:17:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Credentials.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.4.1)
4
+ * Packaged: 2016-07-26T14:25:00+00:00
5
+ * Last Modified: 2016-09-13T10:50:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Credentials.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/Model/Creditmemo/Duty.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.4.0)
4
- * Packaged: 2016-07-28T17:25:00+00:00
5
- * Last Modified: 2016-07-26T14:17:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Creditmemo/Duty.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.4.1)
4
+ * Packaged: 2016-07-26T14:25:00+00:00
5
+ * Last Modified: 2016-09-13T10:50:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Creditmemo/Duty.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/Model/Environmentconfig.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.4.0)
4
- * Packaged: 2016-07-28T17:25:00+00:00
5
- * Last Modified: 2016-07-26T14:17:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Environmentconfig.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.4.1)
4
+ * Packaged: 2016-07-26T14:25:00+00:00
5
+ * Last Modified: 2016-09-13T10:50:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Environmentconfig.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/Model/Handledata.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.4.0)
4
- * Packaged: 2016-07-28T17:25:00+00:00
5
- * Last Modified: 2016-07-26T14:17:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Handlingoptions.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.4.1)
4
+ * Packaged: 2016-07-26T14:25:00+00:00
5
+ * Last Modified: 2016-09-13T10:50:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Handlingoptions.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/Model/Handlingoptions.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.4.0)
4
- * Packaged: 2016-07-28T17:25:00+00:00
5
- * Last Modified: 2016-07-26T14:17:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Handlingoptions.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.4.1)
4
+ * Packaged: 2016-07-26T14:25:00+00:00
5
+ * Last Modified: 2016-09-13T10:50:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Handlingoptions.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/Model/Helper.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.4.0)
4
- * Packaged: 2016-07-28T17:25:00+00:00
5
- * Last Modified: 2016-07-26T14:17:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Helper.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.4.1)
4
+ * Packaged: 2016-07-26T14:25:00+00:00
5
+ * Last Modified: 2016-09-13T10:50:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Helper.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/Model/Inboundparcel.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.4.0)
4
- * Packaged: 2016-07-28T17:25:00+00:00
5
- * Last Modified: 2016-07-26T14:17:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Inboundparcel.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.4.1)
4
+ * Packaged: 2016-07-26T14:25:00+00:00
5
+ * Last Modified: 2016-09-13T10:50:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Inboundparcel.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/Model/Invoice/Duty.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.4.0)
4
- * Packaged: 2016-07-28T17:25:00+00:00
5
- * Last Modified: 2016-07-26T14:17:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Invoice/Duty.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.4.1)
4
+ * Packaged: 2016-07-26T14:25:00+00:00
5
+ * Last Modified: 2016-09-13T10:50:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Invoice/Duty.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/Model/Messages.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.4.0)
4
- * Packaged: 2016-07-28T17:25:00+00:00
5
- * Last Modified: 2016-07-26T14:17:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Messages.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.4.1)
4
+ * Packaged: 2016-07-26T14:25:00+00:00
5
+ * Last Modified: 2016-09-13T10:50:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Messages.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/Model/Mysql4/Inboundparcel.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.4.0)
4
- * Packaged: 2016-07-28T17:25:00+00:00
5
- * Last Modified: 2016-07-26T14:17:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Mysql4/Inboundparcel.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.4.1)
4
+ * Packaged: 2016-07-26T14:25:00+00:00
5
+ * Last Modified: 2016-09-13T10:50:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Mysql4/Inboundparcel.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/Model/Mysql4/Inboundparcel/Collection.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.4.0)
4
- * Packaged: 2016-07-28T17:25:00+00:00
5
- * Last Modified: 2016-07-26T14:17:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Mysql4/Inboundparcel/Collection.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.4.1)
4
+ * Packaged: 2016-07-26T14:25:00+00:00
5
+ * Last Modified: 2016-09-13T10:50:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Mysql4/Inboundparcel/Collection.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/Model/Mysql4/Ordernumber.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.4.0)
4
- * Packaged: 2016-07-28T17:25:00+00:00
5
- * Last Modified: 2016-07-26T14:17:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Mysql4/Ordernumber.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.4.1)
4
+ * Packaged: 2016-07-26T14:25:00+00:00
5
+ * Last Modified: 2016-09-13T10:50:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Mysql4/Ordernumber.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/Model/Mysql4/Ordernumber/Collection.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.4.0)
4
- * Packaged: 2016-07-28T17:25:00+00:00
5
- * Last Modified: 2016-07-26T14:17:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Mysql4/Ordernumber/Collection.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.4.1)
4
+ * Packaged: 2016-07-26T14:25:00+00:00
5
+ * Last Modified: 2016-09-13T10:50:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Mysql4/Ordernumber/Collection.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/Model/Mysql4/Shipmentemail.php ADDED
@@ -0,0 +1,16 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Product: Pb_Pbgsp (1.4.1)
4
+ * Packaged: 2016-07-26T14:25:00+00:00
5
+ * Last Modified: 2016-09-13T10:50:00+00:00
6
+ * File: app/code/local/Pb/Pbgsp/Model/Mysql4/Variable.php
7
+ * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
+ */
9
+ class Pb_Pbgsp_Model_Mysql4_Shipmentemail extends Mage_Core_Model_Mysql4_Abstract {
10
+ public function _construct()
11
+ {
12
+ $this->_init('pb_pbgsp/shipmentemail', 'shipmentemail_id');
13
+ }
14
+ }
15
+
16
+ ?>
app/code/local/Pb/Pbgsp/Model/Mysql4/Shipmentemail/Collection.php ADDED
@@ -0,0 +1,15 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Product: Pb_Pbgsp (1.4.1)
4
+ * Packaged: 2016-07-26T14:25:00+00:00
5
+ * Last Modified: 2016-09-13T10:50:00+00:00
6
+ * File: app/code/local/Pb/Pbgsp/Model/Mysql4/Variable/Collection.php
7
+ * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
+ */
9
+ class Pb_Pbgsp_Model_Mysql4_Shipmentemail_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract {
10
+ public function _construct()
11
+ {
12
+ $this->_init('pb_pbgsp/shipmentemail');
13
+ }
14
+ }
15
+ ?>
app/code/local/Pb/Pbgsp/Model/Mysql4/Variable.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.4.0)
4
- * Packaged: 2016-07-28T17:25:00+00:00
5
- * Last Modified: 2016-07-26T14:17:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Mysql4/Variable.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.4.1)
4
+ * Packaged: 2016-07-26T14:25:00+00:00
5
+ * Last Modified: 2016-09-13T10:50:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Mysql4/Variable.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/Model/Mysql4/Variable/Collection.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.4.0)
4
- * Packaged: 2016-07-28T17:25:00+00:00
5
- * Last Modified: 2016-07-26T14:17:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Mysql4/Variable/Collection.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.4.1)
4
+ * Packaged: 2016-07-26T14:25:00+00:00
5
+ * Last Modified: 2016-09-13T10:50:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Mysql4/Variable/Collection.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/Model/Newhandlingoptions.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.4.0)
4
- * Packaged: 2016-07-28T17:25:00+00:00
5
- * Last Modified: 2016-07-26T14:17:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Handlingoptions.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.4.1)
4
+ * Packaged: 2016-07-26T14:25:00+00:00
5
+ * Last Modified: 2016-09-13T10:50:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Handlingoptions.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/Model/Observer.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.4.0)
4
- * Packaged: 2016-07-28T17:25:00+00:00
5
- * Last Modified: 2016-07-26T14:17:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Observer.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
@@ -407,15 +407,16 @@ class Pb_Pbgsp_Model_Observer {
407
  else if('email/order/shipment/track.phtml' == $observer->getEvent()->getBlock()->getTemplate()) {
408
  if(!Mage::getStoreConfig('carriers/pbgsp/trackinglink'))
409
  return;
410
-
411
- $cpord = $this->_getCPORD($observer->getEvent()->getBlock()->getOrder());
 
412
  if($cpord) {
413
  $staging = 0;
414
  if(strpos(Pb_Pbgsp_Model_Credentials::getCheckoutUrl(),'cpsandbox'))
415
  $staging = 1;
416
 
417
 
418
- $transport['html'] = "<a href='http://tracking.ecommerce.pb.com/track/$cpord?staging=$staging'>Track your order</a>";
419
  }
420
 
421
  }
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.4.1)
4
+ * Packaged: 2016-07-26T14:25:00+00:00
5
+ * Last Modified: 2016-09-13T10:50:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Observer.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
407
  else if('email/order/shipment/track.phtml' == $observer->getEvent()->getBlock()->getTemplate()) {
408
  if(!Mage::getStoreConfig('carriers/pbgsp/trackinglink'))
409
  return;
410
+ $order = $observer->getEvent()->getBlock()->getOrder();
411
+ $cpord = $this->_getCPORD($order);
412
+ $email = $order->getCustomerEmail();
413
  if($cpord) {
414
  $staging = 0;
415
  if(strpos(Pb_Pbgsp_Model_Credentials::getCheckoutUrl(),'cpsandbox'))
416
  $staging = 1;
417
 
418
 
419
+ $transport['html'] = "<a href='https://parceltracking.pb.com/app/#/dashboard/$cpord/$email'>Track your order</a>";
420
  }
421
 
422
  }
app/code/local/Pb/Pbgsp/Model/Ordernumber.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.4.0)
4
- * Packaged: 2016-07-28T17:25:00+00:00
5
- * Last Modified: 2016-07-26T14:17:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Ordernumber.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.4.1)
4
+ * Packaged: 2016-07-26T14:25:00+00:00
5
+ * Last Modified: 2016-09-13T10:50:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Ordernumber.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/Model/Pdf/Tax.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.4.0)
4
- * Packaged: 2016-07-28T17:25:00+00:00
5
- * Last Modified: 2016-07-26T14:17:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Pdf/Tax.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.4.1)
4
+ * Packaged: 2016-07-26T14:25:00+00:00
5
+ * Last Modified: 2016-09-13T10:50:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Pdf/Tax.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/Model/Productattributesource/Productconditions.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.4.0)
4
- * Packaged: 2016-07-28T17:25:00+00:00
5
- * Last Modified: 2016-07-26T14:17:00+00:00
6
 
7
  */
8
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.4.1)
4
+ * Packaged: 2016-07-26T14:25:00+00:00
5
+ * Last Modified: 2016-09-13T10:50:00+00:00
6
 
7
  */
8
 
app/code/local/Pb/Pbgsp/Model/Quote/Duty.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.4.0)
4
- * Packaged: 2016-07-28T17:25:00+00:00
5
- * Last Modified: 2016-07-26T14:17:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Quote/Duty.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.4.1)
4
+ * Packaged: 2016-07-26T14:25:00+00:00
5
+ * Last Modified: 2016-09-13T10:50:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Quote/Duty.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/Model/Resource/Mysql4/Setup.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.4.0)
4
- * Packaged: 2016-07-28T17:25:00+00:00
5
- * Last Modified: 2016-07-26T14:17:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Resource/Mysql4/Setup.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.4.1)
4
+ * Packaged: 2016-07-26T14:25:00+00:00
5
+ * Last Modified: 2016-09-13T10:50:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Resource/Mysql4/Setup.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/Model/Sales/Order/Shipment.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.4.0)
4
- * Packaged: 2016-07-28T17:25:00+00:00
5
- * Last Modified: 2016-07-26T14:17:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Sales/Order/Shipment.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
@@ -11,9 +11,44 @@ class Pb_Pbgsp_Model_Sales_Order_Shipment extends Mage_Sales_Model_Order_Shipmen
11
 
12
  public function sendEmail($notifyCustomer = true, $comment = '')
13
  {
14
- if(Mage::getStoreConfig('carriers/pbgsp/suppress_domestic_tracking') != '1')
15
- return parent::sendEmail($notifyCustomer,$comment);
16
  $order = $this->getOrder();
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
17
  $storeId = $order->getStore()->getId();
18
 
19
  if (!Mage::helper('sales')->canSendNewShipmentEmail($storeId)) {
@@ -55,15 +90,17 @@ class Pb_Pbgsp_Model_Sales_Order_Shipment extends Mage_Sales_Model_Order_Shipmen
55
  $customerName = $order->getCustomerName();
56
  }
57
 
58
-
59
-
 
60
  $emailTemplateVariables = array(
61
  'order' => $order,
62
  'shipment' => $this,
63
  'comment' => $comment,
64
  'billing' => $order->getBillingAddress(),
65
  'store' => Mage::app()->getStore($storeId),
66
- 'payment_html' => $paymentBlockHtml
 
67
 
68
 
69
  );
@@ -74,6 +111,7 @@ class Pb_Pbgsp_Model_Sales_Order_Shipment extends Mage_Sales_Model_Order_Shipmen
74
  Mage::getStoreConfig('carriers/pbgsp/custom_shipment_email_subject'));
75
  $emailTemplate->setSenderEmail(Mage::getStoreConfig(self::XML_PATH_EMAIL_IDENTITY, $storeId));
76
  $processedTemplate = $emailTemplate->getProcessedTemplate($emailTemplateVariables);
 
77
  //Pb_Pbgsp_Model_Util::log($processedTemplate);
78
  //$emailTemplate->send($order->getCustomerEmail(), $customerName,$emailTemplateVariables);
79
  //Pb_Pbgsp_Model_Util::log('Email subject'. $emailTemplate->getTemplateSubject());
@@ -94,6 +132,11 @@ class Pb_Pbgsp_Model_Sales_Order_Shipment extends Mage_Sales_Model_Order_Shipmen
94
  $mail->send();
95
  //Pb_Pbgsp_Model_Util::log("Email sent to");
96
  //Pb_Pbgsp_Model_Util::log($order->getCustomerEmail());
 
 
 
 
 
97
  }
98
  catch(Exception $error)
99
  {
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.4.1)
4
+ * Packaged: 2016-07-26T14:25:00+00:00
5
+ * Last Modified: 2016-09-13T10:50:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Sales/Order/Shipment.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
11
 
12
  public function sendEmail($notifyCustomer = true, $comment = '')
13
  {
14
+ $delayInMinutes = 5;
15
+ Mage::log('Pb_Pbgsp_Model_Sales_Order_Shipment.sendEmail');
16
  $order = $this->getOrder();
17
+ if(!Pb_Pbgsp_Model_Util::isPbOrder($order->getShippingMethod())){
18
+ return parent::sendEmail($notifyCustomer,$comment);
19
+ }
20
+ $shipmentemail = null;
21
+ $shipmentemailColl = Mage::getModel("pb_pbgsp/shipmentemail")-> getCollection();
22
+ $shipmentemailColl -> addFieldToFilter('shipment_id',$this->getIncrementId());
23
+ foreach($shipmentemailColl as $semail) {
24
+ $shipmentemail = $semail;
25
+ break;
26
+ }
27
+ if(!$shipmentemail) {
28
+ //delay the email
29
+ $shipmentemail = Mage::getModel("pb_pbgsp/shipmentemail");
30
+ $shipmentemail->setShipmentId($this->getIncrementId());
31
+ $shipmentemail->setCreatedDate(time());
32
+ $shipmentemail->save();
33
+ return $this;
34
+ }
35
+ else {
36
+ $createdTime = intval($shipmentemail->getCreatedDate());
37
+ if(time() < ($createdTime + (60 + $delayInMinutes))) {
38
+ //Mage::log("time() < ($createdTime + (60 + $delayInMinutes))");
39
+ return $this;
40
+ }
41
+ }
42
+ if(Mage::getStoreConfig('carriers/pbgsp/suppress_domestic_tracking') != '1') {
43
+ parent::sendEmail($notifyCustomer,$comment);
44
+ if($shipmentemail) {
45
+ $shipmentemail->setEmailSent(time());
46
+ $shipmentemail->save();
47
+ }
48
+ return $this;
49
+ }
50
+
51
+
52
  $storeId = $order->getStore()->getId();
53
 
54
  if (!Mage::helper('sales')->canSendNewShipmentEmail($storeId)) {
90
  $customerName = $order->getCustomerName();
91
  }
92
 
93
+ $cpord = Pb_Pbgsp_Model_Util::getCPORD($order);
94
+ $email = $order->getCustomerEmail();
95
+ $trackingUrl = "https://parceltracking.pb.com/app/#/dashboard/$cpord/$email";
96
  $emailTemplateVariables = array(
97
  'order' => $order,
98
  'shipment' => $this,
99
  'comment' => $comment,
100
  'billing' => $order->getBillingAddress(),
101
  'store' => Mage::app()->getStore($storeId),
102
+ 'payment_html' => $paymentBlockHtml,
103
+ 'tracking_url' => $trackingUrl
104
 
105
 
106
  );
111
  Mage::getStoreConfig('carriers/pbgsp/custom_shipment_email_subject'));
112
  $emailTemplate->setSenderEmail(Mage::getStoreConfig(self::XML_PATH_EMAIL_IDENTITY, $storeId));
113
  $processedTemplate = $emailTemplate->getProcessedTemplate($emailTemplateVariables);
114
+ $processedTemplate = str_replace("PBGSP_Manual_Catalog_Export","index",$processedTemplate);
115
  //Pb_Pbgsp_Model_Util::log($processedTemplate);
116
  //$emailTemplate->send($order->getCustomerEmail(), $customerName,$emailTemplateVariables);
117
  //Pb_Pbgsp_Model_Util::log('Email subject'. $emailTemplate->getTemplateSubject());
132
  $mail->send();
133
  //Pb_Pbgsp_Model_Util::log("Email sent to");
134
  //Pb_Pbgsp_Model_Util::log($order->getCustomerEmail());
135
+ if($shipmentemail) {
136
+ $shipmentemail->setEmailSent(time());
137
+ $shipmentemail->save();
138
+ Mage::log("shipmentemail set".$shipmentemail->getEmailSent());
139
+ }
140
  }
141
  catch(Exception $error)
142
  {
app/code/local/Pb/Pbgsp/Model/Shipmentemail.php ADDED
@@ -0,0 +1,28 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Product: Pb_Pbgsp (1.4.1)
4
+ * Packaged: 2016-07-26T14:25:00+00:00
5
+ * Last Modified: 2016-09-13T10:50:00+00:00
6
+ * File: app/code/local/Pb/Pbgsp/Model/Variable.php
7
+ * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
+ */
9
+ class Pb_Pbgsp_Model_Shipmentemail extends Mage_Core_Model_Abstract {
10
+ public function _construct()
11
+ {
12
+ parent::_construct();
13
+ $this->_init('pb_pbgsp/shipmentemail');
14
+ }
15
+
16
+ public function sendShipmentEmails() {
17
+ $shipmentemailColl = Mage::getModel("pb_pbgsp/shipmentemail")-> getCollection();
18
+ $shipmentemailColl -> addFieldToFilter('email_sent',array('null' => true));
19
+ foreach($shipmentemailColl as $shipEmail) {
20
+ $shipment = Mage::getModel("sales/order_shipment");
21
+ /* @var Mage_Sales_Model_Order_Shipment $shipment */
22
+ $shipment->loadByIncrementId($shipEmail->getShipmentId());
23
+ $shipment->sendEmail();
24
+ }
25
+ }
26
+ }
27
+
28
+ ?>
app/code/local/Pb/Pbgsp/Model/Util.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.4.0)
4
- * Packaged: 2016-07-28T17:25:00+00:00
5
- * Last Modified: 2016-07-26T14:17:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Util.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
@@ -63,6 +63,51 @@ class Pb_Pbgsp_Model_Util {
63
  public static function stripHtml($text) {
64
  return preg_replace("/<\s*\/\s*\w\s*.*?>|<\s*br\s*>/",'',preg_replace("/<\s*\w.*?>/", '', $text));
65
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
66
  }
67
 
68
  ?>
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.4.1)
4
+ * Packaged: 2016-07-26T14:25:00+00:00
5
+ * Last Modified: 2016-09-13T10:50:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Util.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
63
  public static function stripHtml($text) {
64
  return preg_replace("/<\s*\/\s*\w\s*.*?>|<\s*br\s*>/",'',preg_replace("/<\s*\w.*?>/", '', $text));
65
  }
66
+
67
+ public static function getTempDir() {
68
+ $appRoot = Mage::getRoot();
69
+ $mageRoot = dirname($appRoot);
70
+ $configOptions = Mage::getModel('core/config_options');
71
+ $tmpDir = $mageRoot . '/var/pbgsp/tmp/';
72
+ $configOptions->createDirIfNotExists( $tmpDir);
73
+ chmod($tmpDir, 0777);
74
+ return $tmpDir;
75
+ }
76
+
77
+ public static function getSftpCredentials()
78
+ {
79
+ $credentials = array(
80
+ 'host' => Pb_Pbgsp_Model_Credentials::getSftpHostname(),
81
+ "port" => Pb_Pbgsp_Model_Credentials::getSftpPort(),
82
+ 'username' => Pb_Pbgsp_Model_Credentials::getSftpUsername(),
83
+ 'password' => Pb_Pbgsp_Model_Credentials::getSftpPassword(),
84
+ 'timeout' => '10'
85
+ );
86
+ return $credentials;
87
+ }
88
+
89
+ public static function getCPORD($order)
90
+ {
91
+ if($order) {
92
+ $cpOrder = self::getCpOrderNumber($order);
93
+ if($cpOrder) {
94
+ return $cpOrder -> getCpOrderNumber();
95
+ }
96
+
97
+ }
98
+
99
+ return false;
100
+ }
101
+ public static function getCpOrderNumber($order)
102
+ {
103
+ if($order) {
104
+
105
+ $cpOrder = Mage::getModel("pb_pbgsp/ordernumber")->load($order -> getRealOrderId(),'mage_order_number');
106
+ return $cpOrder;
107
+ }
108
+
109
+ return false;
110
+ }
111
  }
112
 
113
  ?>
app/code/local/Pb/Pbgsp/Model/Variable.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.4.0)
4
- * Packaged: 2016-07-28T17:25:00+00:00
5
- * Last Modified: 2016-07-26T14:17:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Variable.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.4.1)
4
+ * Packaged: 2016-07-26T14:25:00+00:00
5
+ * Last Modified: 2016-09-13T10:50:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Variable.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/controllers/Adminhtml/CategorysettingsController.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.4.0)
4
- * Packaged: 2016-07-28T17:25:00+00:00
5
- * Last Modified: 2016-07-26T14:17:00+00:00
6
  */
7
 
8
  class Pb_Pbgsp_Adminhtml_CategorysettingsController extends Mage_Adminhtml_Controller_Action {
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.4.1)
4
+ * Packaged: 2016-07-26T14:25:00+00:00
5
+ * Last Modified: 2016-09-13T10:50:00+00:00
6
  */
7
 
8
  class Pb_Pbgsp_Adminhtml_CategorysettingsController extends Mage_Adminhtml_Controller_Action {
app/code/local/Pb/Pbgsp/data/pb_pbgsp_setup/data-install-1.0.0.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.4.0)
4
- * Packaged: 2016-07-28T17:25:00+00:00
5
- * Last Modified: 2016-07-26T14:17:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.4.1)
4
+ * Packaged: 2016-07-26T14:25:00+00:00
5
+ * Last Modified: 2016-09-13T10:50:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/etc/adminhtml.xml ADDED
@@ -0,0 +1,23 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?xml version="1.0"?>
2
+ <config>
3
+
4
+ <acl>
5
+ <resources>
6
+
7
+ <admin>
8
+ <children>
9
+ <pbgsp module="pbgsp">
10
+ <title>PBGSP Module</title>
11
+ <children>
12
+ <items module="pbgsp">
13
+ <title>Category Settings</title>
14
+
15
+ </items>
16
+ </children>
17
+
18
+ </pbgsp>
19
+ </children>
20
+ </admin>
21
+ </resources>
22
+ </acl>
23
+ </config>
app/code/local/Pb/Pbgsp/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <Pb_Pbgsp>
5
- <version>1.4.0</version>
6
  </Pb_Pbgsp>
7
  </modules>
8
  <global>
@@ -62,6 +62,9 @@
62
  <inboundparcel>
63
  <table>pbgsp_inbound_parcel</table>
64
  </inboundparcel>
 
 
 
65
  </entities>
66
  </pb_pbgsp_mysql4>
67
  <sales>
@@ -510,6 +513,14 @@
510
  <model>pb_pbgsp/Inboundparcel::generateInboundParcelPreAdviceCron</model>
511
  </run>
512
  </pb_generateASN>
 
 
 
 
 
 
 
 
513
  </jobs>
514
  </crontab>
515
 
@@ -571,21 +582,7 @@
571
  </children>
572
  </pbgsp>
573
  </menu>
574
- <acl>
575
- <resources>
576
- <all>
577
- <title>Allow Everything</title>
578
- </all>
579
- <admin>
580
- <children>
581
- <Pb_Pbgsp>
582
- <title>PBGSP Module</title>
583
- <sort_order>10</sort_order>
584
- </Pb_Pbgsp>
585
- </children>
586
- </admin>
587
- </resources>
588
- </acl>
589
 
590
 
591
 
2
  <config>
3
  <modules>
4
  <Pb_Pbgsp>
5
+ <version>1.4.1</version>
6
  </Pb_Pbgsp>
7
  </modules>
8
  <global>
62
  <inboundparcel>
63
  <table>pbgsp_inbound_parcel</table>
64
  </inboundparcel>
65
+ <shipmentemail>
66
+ <table>pbgsp_shipmentemail</table>
67
+ </shipmentemail>
68
  </entities>
69
  </pb_pbgsp_mysql4>
70
  <sales>
513
  <model>pb_pbgsp/Inboundparcel::generateInboundParcelPreAdviceCron</model>
514
  </run>
515
  </pb_generateASN>
516
+ <pb_shipmentemail>
517
+ <schedule>
518
+ <cron_expr>30 * * * *</cron_expr>
519
+ </schedule>
520
+ <run>
521
+ <model>pb_pbgsp/shipmentemail::sendShipmentEmails</model>
522
+ </run>
523
+ </pb_shipmentemail>
524
  </jobs>
525
  </crontab>
526
 
582
  </children>
583
  </pbgsp>
584
  </menu>
585
+
 
 
 
 
 
 
 
 
 
 
 
 
 
 
586
 
587
 
588
 
app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.4.0)
4
- * Packaged: 2016-07-28T17:25:00+00:00
5
- * Last Modified: 2016-07-26T14:17:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.4.1)
4
+ * Packaged: 2016-07-26T14:25:00+00:00
5
+ * Last Modified: 2016-09-13T10:50:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.0.0-1.0.1.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.4.0)
4
- * Packaged: 2016-07-28T17:25:00+00:00
5
- * Last Modified: 2016-07-26T14:17:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.4.1)
4
+ * Packaged: 2016-07-26T14:25:00+00:00
5
+ * Last Modified: 2016-09-13T10:50:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.1.1-1.1.2.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.4.0)
4
- * Packaged: 2016-07-28T17:25:00+00:00
5
- * Last Modified: 2016-07-26T14:17:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.4.1)
4
+ * Packaged: 2016-07-26T14:25:00+00:00
5
+ * Last Modified: 2016-09-13T10:50:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.2.0-1.2.1.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.4.0)
4
- * Packaged: 2016-07-28T17:25:00+00:00
5
- * Last Modified: 2016-07-26T14:17:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.4.1)
4
+ * Packaged: 2016-07-26T14:25:00+00:00
5
+ * Last Modified: 2016-09-13T10:50:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.3.0-1.3.1.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.4.0)
4
- * Packaged: 2016-07-28T17:25:00+00:00
5
- * Last Modified: 2016-07-26T14:17:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.4.1)
4
+ * Packaged: 2016-07-26T14:25:00+00:00
5
+ * Last Modified: 2016-09-13T10:50:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.3.5-1.3.6.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.4.0)
4
- * Packaged: 2016-07-28T17:25:00+00:00
5
- * Last Modified: 2016-07-26T14:17:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.4.1)
4
+ * Packaged: 2016-07-26T14:25:00+00:00
5
+ * Last Modified: 2016-09-13T10:50:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.4.0-1.4.1.php ADDED
@@ -0,0 +1,47 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Product: Pb_Pbgsp (1.4.1)
4
+ * Packaged: 2016-07-26T14:25:00+00:00
5
+ * Last Modified: 2016-09-13T10:50:00+00:00
6
+ * File: app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php
7
+ * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
+ */
9
+
10
+
11
+ $installer = $this;
12
+
13
+ $installer->startSetup();
14
+
15
+ $eavAttribute = new Mage_Eav_Model_Mysql4_Entity_Attribute();
16
+ $attrributeId = $eavAttribute->getIdByCode('catalog_product', 'pb_pbgsp_package_weight');
17
+ $attribute = Mage::getModel('catalog/resource_eav_attribute')->load($attrributeId);
18
+ $attribute->setFrontendLabel('Package Weight (lbs.)')->save();
19
+
20
+ $attrributeId = $eavAttribute->getIdByCode('catalog_product', 'pb_pbgsp_commodity_height');
21
+ $attribute = Mage::getModel('catalog/resource_eav_attribute')->load($attrributeId);
22
+ $attribute->setFrontendLabel('Commodity Height (in.)')->save();
23
+
24
+ $attrributeId = $eavAttribute->getIdByCode('catalog_product', 'pb_pbgsp_commodity_width');
25
+ $attribute = Mage::getModel('catalog/resource_eav_attribute')->load($attrributeId);
26
+ $attribute->setFrontendLabel('Commodity Width (in.)')->save();
27
+
28
+ $attrributeId = $eavAttribute->getIdByCode('catalog_product', 'pb_pbgsp_commodity_length');
29
+ $attribute = Mage::getModel('catalog/resource_eav_attribute')->load($attrributeId);
30
+ $attribute->setFrontendLabel('Commodity Length (in.)')->save();
31
+
32
+
33
+
34
+ $attrributeId = $eavAttribute->getIdByCode('catalog_product', 'pb_pbgsp_package_height');
35
+ $attribute = Mage::getModel('catalog/resource_eav_attribute')->load($attrributeId);
36
+ $attribute->setFrontendLabel('Package Height (in.)')->save();
37
+
38
+ $attrributeId = $eavAttribute->getIdByCode('catalog_product', 'pb_pbgsp_package_width');
39
+ $attribute = Mage::getModel('catalog/resource_eav_attribute')->load($attrributeId);
40
+ $attribute->setFrontendLabel('Package Width (in.)')->save();
41
+
42
+ $attrributeId = $eavAttribute->getIdByCode('catalog_product', 'pb_pbgsp_package_length');
43
+ $attribute = Mage::getModel('catalog/resource_eav_attribute')->load($attrributeId);
44
+ $attribute->setFrontendLabel('Package Length (in.)')->save();
45
+
46
+ $installer->endSetup();
47
+ ?>
app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.4.1-1.4.2.php ADDED
@@ -0,0 +1,31 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Product: Pb_Pbgsp (1.4.1)
4
+ * Packaged: 2016-07-26T14:25:00+00:00
5
+ * Last Modified: 2016-09-13T10:50:00+00:00
6
+ * File: app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php
7
+ * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
+ */
9
+
10
+
11
+ $installer = $this;
12
+
13
+ $installer->startSetup();
14
+
15
+ $installer->run("
16
+
17
+ DROP TABLE IF EXISTS {$this->getTable('pb_pbgsp/shipmentemail')};
18
+ CREATE TABLE {$this->getTable('pb_pbgsp/shipmentemail')} (
19
+ `shipmentemail_id` int(11) unsigned NOT NULL auto_increment,
20
+ `shipment_id` varchar(255) NOT NULL default '',
21
+ `created_date` int NOT NULL ,
22
+ `email_sent` int NULL ,
23
+ PRIMARY KEY (`shipmentemail_id`)
24
+ ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
25
+
26
+
27
+
28
+ ");
29
+
30
+ $installer->endSetup();
31
+ ?>
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>pitneybowes_gsp</name>
4
- <version>1.4.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>
@@ -22,14 +22,20 @@ Providing full international tracking linked from your admin page&#xD;
22
  &lt;/ul&gt;&#xD;
23
  To learn more, go to &lt;a href="http://www.pb.com/ecom"&gt;http://www.pb.com/ecom&lt;/a&gt;&#xD;
24
  </description>
25
- <notes>1. Cleaned up the layout of the shipping methods configuration screen. Organized fields by relevant groups for easier management.&#xD;
26
- &#xD;
27
- 2. Addition of commodities and seller details in api calls during checkout for marketplace customers. Added shipping method configs to enable/disable seller details.&#xD;
28
- </notes>
 
 
 
 
 
 
29
  <authors><author><name>Shane Bogdan</name><user>pbecommerce</user><email>shane.bogdan@pb.com</email></author></authors>
30
- <date>2016-07-29</date>
31
- <time>00:59:50</time>
32
- <contents><target name="magelocal"><dir name="Pb"><dir name="Pbgsp"><dir name="Block"><dir name="Adminhtml"><dir name="Categorysettings"><file name="Grid.php" hash="ab01d7a821090af2ebc557d32fb957e6"/></dir><file name="Categorysettings.php" hash="e325eeb47feba658fe48be0b083d37d5"/><dir name="Sales"><dir name="Order"><dir name="Invoice"><file name="Totals.php" hash="da3be7f712ee7c4813e4db4e56903477"/></dir><file name="Totals.php" hash="634b59e817af11bd3e5f35dd78f5a700"/></dir></dir><file name="Version.php" hash="4e2d549fa13cfa4e3f0a89266d7c9afd"/></dir><dir name="Checkout"><dir name="Shipping"><dir name="Method"><file name="Available.php" hash="87afba37b9b7f783bde8d3a250a008e1"/></dir></dir></dir><file name="Form.php" hash="4dccf06935c21bc9621d9cb061ba32e7"/><dir name="Sales"><dir name="Order"><dir name="Invoice"><file name="Totals.php" hash="abe5d156d429709cb5ca7baf8ef779e6"/></dir><file name="Totals.php" hash="f11dc603211bf3060597ff3d61d5ab01"/></dir></dir><dir name="Tax"><dir name="Checkout"><file name="Tax.php" hash="457f0d827797ed0ac6a80e9bf77b7df0"/></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="1dc5a184e36f95bc8512e06383bc7871"/></dir><dir name="Model"><file name="Api.php" hash="71832d9805ec76221c518f3dcb3bb569"/><dir name="Carrier"><file name="ShippingMethod.php" hash="c865e4c08830d34551a187365345fc0f"/></dir><dir name="Catalog"><file name="Category.php" hash="eafaea527bebc8d7d66932e2645dd602"/><file name="Cron.php" hash="f592896996db9a4b36c4961b5cfaec24"/><file name="File.php" hash="c5033abde596dad024746b7f30cb78c4"/><file name="Product.php" hash="c9333705a72a84e41c1e724239c02b34"/></dir><file name="Credentials.php" hash="7df0a7509aefc10a561e3668b92f6c0e"/><dir name="Creditmemo"><file name="Duty.php" hash="b80211eefdcdea74e807c3b5da05a7e6"/></dir><file name="Environmentconfig.php" hash="ebbe8e69ec095c121c2d0edfbfd8a15c"/><file name="Handledata.php" hash="9f5f9e575334c31333ea8c398b0b40aa"/><file name="Handlingoptions.php" hash="94b79316e02960a0a4386dd268c42f20"/><file name="Helper.php" hash="91b095588306f966a9fc67e5c983dc46"/><file name="Inboundparcel.php" hash="c9bb24f0b19125c7fa3ff011b0ed50e1"/><dir name="Invoice"><file name="Duty.php" hash="c7439ec1a7f3f44e3fad0e42ceeb79bd"/></dir><file name="Messages.php" hash="f31a92e85f2ec0aa9746cb2b0123ff6b"/><dir name="Mysql4"><dir name="Inboundparcel"><file name="Collection.php" hash="e5a50c55105dbe7dc9da8a1141c35010"/></dir><file name="Inboundparcel.php" hash="74c8fdb017dbca8644c63f5e015a5a5e"/><dir name="Ordernumber"><file name="Collection.php" hash="1cf61e307e6bf71b0532170a9be72584"/></dir><file name="Ordernumber.php" hash="19ffbdde3f84abfbaf5a560174ad11fa"/><dir name="Variable"><file name="Collection.php" hash="f300665dfb7ea4af612eea5f79b831e3"/></dir><file name="Variable.php" hash="2635ac1a2f506f9597f1f8cb1786a0fb"/></dir><file name="Newhandlingoptions.php" hash="6c60856548cbc6c3efc817abcdc639ae"/><file name="Observer.php" hash="e3333284dfa025e9a47254e8c2310596"/><file name="Ordernumber.php" hash="7496d476742eb7fa380bc184f28673d5"/><dir name="Pdf"><file name="Tax.php" hash="5d917816d876f68a7b5db039c9632070"/></dir><file name="Phonetype.php" hash="9a5a5d3af53a6f137c578ba391626d27"/><dir name="Productattributesource"><file name="Productconditions.php" hash="33beabae883eafe4c99ed44810c5e70a"/></dir><dir name="Quote"><file name="Duty.php" hash="3350fd2997deae1837a26163a15d87c2"/></dir><dir name="Resource"><dir name="Mysql4"><file name="Setup.php" hash="ace4f8f47d2cd7d31f3c02e4ba23e1ae"/></dir></dir><dir name="Sales"><dir name="Order"><file name="Shipment.php" hash="18f5dd580ce5b3c808d49370fb3fdd05"/></dir></dir><file name="Sellertype.php" hash="0f966b509b0c84ebaedb292abbea8929"/><file name="Util.php" hash="659fdd6dad892c39a3108f34c65357e6"/><file name="Variable.php" hash="84f38a26928cc4577b885b0a0687916b"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="CategorysettingsController.php" hash="9007729986b03485f22cfb8b315ef314"/></dir></dir><dir name="data"><dir name="pb_pbgsp_setup"><file name="data-install-1.0.0.php" hash="c604f70ed0253df0cc55712a2d6a78e9"/></dir></dir><dir name="etc"><file name="config.xml" hash="90e105ec2ab96400e803dab2959dc246"/><file name="system.xml" hash="3d39b59e89c4b307dadcc4021e7723ef"/></dir><dir name="sql"><dir name="pbgsp_setup"><file name="mysql4-install-1.0.0.php" hash="060e8597361d08552f922596ece46306"/><file name="mysql4-upgrade-1.0.0-1.0.1.php" hash="243e5b2e83ae3108708c864d4e16261a"/><file name="mysql4-upgrade-1.1.1-1.1.2.php" hash="73bf47d2183b12caad151a3be32e9199"/><file name="mysql4-upgrade-1.2.0-1.2.1.php" hash="8c60f1bba2dd5abf0e93f497c5fa7564"/><file name="mysql4-upgrade-1.3.0-1.3.1.php" hash="a4c237c91f06c6650dd7ba24a2d13349"/><file name="mysql4-upgrade-1.3.5-1.3.6.php" hash="25851742d8eeabae22591972f855964b"/></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="d41d8cd98f00b204e9800998ecf8427e"/><file name="PBGSP_Manual_Catalog_Export.php" hash="d41d8cd98f00b204e9800998ecf8427e"/></dir></target></contents>
33
  <compatible/>
34
  <dependencies><required><php><min>5.1.0</min><max>5.6.10</max></php></required></dependencies>
35
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>pitneybowes_gsp</name>
4
+ <version>1.4.1</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>
22
  &lt;/ul&gt;&#xD;
23
  To learn more, go to &lt;a href="http://www.pb.com/ecom"&gt;http://www.pb.com/ecom&lt;/a&gt;&#xD;
24
  </description>
25
+ <notes>1 add "lbs." with Package Weight.&#xD;
26
+ 2 add (in.) to length related fields&#xD;
27
+ 3 Fixed Group Permission issue in Magento role editor&#xD;
28
+ 4 Removed the "no-reply@pb.com" email as it was causing relay errors on some installations&#xD;
29
+ 5 Changed catalog export CSV to have line endings with CRLF&#xD;
30
+ 6 Add tracking url update to use newer https://parceltracking.pb.com URL&#xD;
31
+ 7 Add condition to allow for tracking link to be added to custom shipment email. Add following code to custom email template to include a link in the transaction: (Track your order from &lt;a href="{{var tracking_url}}"&gt;here.&lt;/a&gt;)&#xD;
32
+ 8 Update shipping email template to include tracking link to new pb shipping tool&#xD;
33
+ 9 Add a delay in sending shipment notification to ensure the process isn&#x2019;t triggered before PB system updates (5 minutes)&#xD;
34
+ 10 Fixed an issue of missing Package_Weight column in catalog export file</notes>
35
  <authors><author><name>Shane Bogdan</name><user>pbecommerce</user><email>shane.bogdan@pb.com</email></author></authors>
36
+ <date>2016-09-13</date>
37
+ <time>15:00:57</time>
38
+ <contents><target name="magelocal"><dir name="Pb"><dir name="Pbgsp"><dir name="Block"><dir name="Adminhtml"><dir name="Categorysettings"><file name="Grid.php" hash="1f85b40ccb29a6087caf81064912c99c"/></dir><file name="Categorysettings.php" hash="bb4aace74b24372ba48a2d40a58eb8a1"/><dir name="Sales"><dir name="Order"><dir name="Invoice"><file name="Totals.php" hash="b47be50d1e1927c3e02194b12feb1c11"/></dir><file name="Totals.php" hash="c5ccecdb7e6524e4298bc2a69a884841"/></dir></dir><file name="Version.php" hash="7978b308867ab71408572da0a4a54eb4"/></dir><dir name="Checkout"><dir name="Shipping"><dir name="Method"><file name="Available.php" hash="87d62bb9d71d409669275adc6485c24b"/></dir></dir></dir><file name="Form.php" hash="35a7916413e10c5569e200dd6f519ce7"/><dir name="Sales"><dir name="Order"><dir name="Invoice"><file name="Totals.php" hash="097f692121d4fc9764399689e319f899"/></dir><file name="Totals.php" hash="bc0735120b5ef620b4198270fc61d74c"/></dir></dir><dir name="Tax"><dir name="Checkout"><file name="Tax.php" hash="7642d7abfec20c376788ecfe44c1c650"/></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="03eb75e40f1d3d7fcde5efd3da1ce350"/></dir><dir name="Model"><file name="Api.php" hash="a480386a74a45ee8851cdb602b50159a"/><dir name="Carrier"><file name="ShippingMethod.php" hash="6ed250db925a606853df10401b9c68bc"/></dir><dir name="Catalog"><file name="Category.php" hash="ff6a8f2a80c62dee08f5dccf995b7239"/><file name="Cron.php" hash="ceafc85a1a4d9602aa6490bae4d91d11"/><file name="File.php" hash="81869e0fa978123ec843136fd9449305"/><file name="Product.php" hash="72832bcbb436e61a9e62c5eeba8a9025"/></dir><file name="Credentials.php" hash="73dec8848b25851071a0f0234b92d77f"/><dir name="Creditmemo"><file name="Duty.php" hash="0b67d5397eb71c196bebedb227f4ef12"/></dir><file name="Environmentconfig.php" hash="8dfa279390386323c42398b8e65c35b2"/><file name="Handledata.php" hash="197790f99d565eebb485237cd23fc316"/><file name="Handlingoptions.php" hash="241f8132fbf46fc1051dfdc3805755de"/><file name="Helper.php" hash="e256f75f74c6ddbaacc8c2168eb5fcd3"/><file name="Inboundparcel.php" hash="3e7c2b2e6bcdf0351b285ebf4843cc33"/><dir name="Invoice"><file name="Duty.php" hash="7ecc573fc0bf728dd54568d02161cce8"/></dir><file name="Messages.php" hash="d84a49f2293d7e9a7c04b62b946c662f"/><dir name="Mysql4"><dir name="Inboundparcel"><file name="Collection.php" hash="030a8c9453b90efda3c204b0d128b10b"/></dir><file name="Inboundparcel.php" hash="575b1b661dce2ed66070713807ef67a8"/><dir name="Ordernumber"><file name="Collection.php" hash="8aebc21ee1a9dbdf902a0907931b31fb"/></dir><file name="Ordernumber.php" hash="1eae657dfbc0bc79c25acf60b82dadcf"/><dir name="Shipmentemail"><file name="Collection.php" hash="261d8ec734fa4d5d5e99565cf48f1d9d"/></dir><file name="Shipmentemail.php" hash="1b448a041f79a22642194c0836025e8a"/><dir name="Variable"><file name="Collection.php" hash="53ea8ca2940c9eda806f6f953ad12e54"/></dir><file name="Variable.php" hash="21e71885178eefe5e64e204d6e291725"/></dir><file name="Newhandlingoptions.php" hash="822b4abcc65e8c9fb20403379d5bcdc5"/><file name="Observer.php" hash="efd780654272f476a0a552e97b00885a"/><file name="Ordernumber.php" hash="5ec3b9fdbdcbc0ee1844fac406d524b6"/><dir name="Pdf"><file name="Tax.php" hash="790fc1f537d5ccb92538be9138d42a9f"/></dir><file name="Phonetype.php" hash="9a5a5d3af53a6f137c578ba391626d27"/><dir name="Productattributesource"><file name="Productconditions.php" hash="a5f985149ffd6a0429c776deed9cc47d"/></dir><dir name="Quote"><file name="Duty.php" hash="f74b168b3e50c8b982dae67257061333"/></dir><dir name="Resource"><dir name="Mysql4"><file name="Setup.php" hash="ea9a93b91ccc9b59f0fb8815b39ee797"/></dir></dir><dir name="Sales"><dir name="Order"><file name="Shipment.php" hash="f12a77ad26f8da83c391afe61a21fabe"/></dir></dir><file name="Sellertype.php" hash="0f966b509b0c84ebaedb292abbea8929"/><file name="Shipmentemail.php" hash="576fe253bcc26ff6826b0c59ca4ef730"/><file name="Util.php" hash="1dc702a6a2d73a2fd5a315f1da00221e"/><file name="Variable.php" hash="3fa276e3ce21985bb97a9df4a6606a64"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="CategorysettingsController.php" hash="a338a730d0adc0f4e41b974a241d2c02"/></dir></dir><dir name="data"><dir name="pb_pbgsp_setup"><file name="data-install-1.0.0.php" hash="675682f9d50ee45ec5263c2644a57b40"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="df090fe6dcdfe68acdb012d6e2405cef"/><file name="config.xml" hash="96e6d189eebc4190b86c34d3f563e9a2"/><file name="system.xml" hash="3d39b59e89c4b307dadcc4021e7723ef"/></dir><dir name="sql"><dir name="pbgsp_setup"><file name="mysql4-install-1.0.0.php" hash="cc1c81bc6affc2768a8010a266bcab32"/><file name="mysql4-upgrade-1.0.0-1.0.1.php" hash="bc35d6d1028d19b08d0ae8facbaa5f4c"/><file name="mysql4-upgrade-1.1.1-1.1.2.php" hash="4687bc794a6553df56a0b9d495b4c09e"/><file name="mysql4-upgrade-1.2.0-1.2.1.php" hash="e3f04cb52078d5c973fbf19418c5f321"/><file name="mysql4-upgrade-1.3.0-1.3.1.php" hash="e7fdf2afa1b571e78f0210150b3727f9"/><file name="mysql4-upgrade-1.3.5-1.3.6.php" hash="ed2c25f3dae296280c18a8de6df77fea"/><file name="mysql4-upgrade-1.4.0-1.4.1.php" hash="1eef51aa5c70f2f749e4b77ef42e0122"/><file name="mysql4-upgrade-1.4.1-1.4.2.php" hash="f80f24d0add11da1fe976fe1da2ef20d"/></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="d41d8cd98f00b204e9800998ecf8427e"/><file name="PBGSP_Manual_Catalog_Export.php" hash="d41d8cd98f00b204e9800998ecf8427e"/></dir></target></contents>
39
  <compatible/>
40
  <dependencies><required><php><min>5.1.0</min><max>5.6.10</max></php></required></dependencies>
41
  </package>