pitneybowes_gsp - Version 1.3.2

Version Notes

1. Check for valid Magento order for ASN generation. Fixed an issue where if there was a problem at checkout, like credit card not working, an entry was created with the PB Order # but no Magento order #. The job that generates ASN will crash when it discovers these orphaned entries. If a valid magento order number isn’t generated at the time of order, an ASN will not be generated for the order.

2. Cleaned up the get group details functionality to remove warning notice in logs.

3. Integrated PB in carrier list for tracking details. Customer no longer sees the "custom value" title but more accurately sees the "PB INTERNATIONAL SHIPPING" carrier.

Download this release

Release Info

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


Code changes from version 1.3.0 to 1.3.2

Files changed (52) hide show
  1. PBGSP_Manual_Catalog_Export.php +7 -0
  2. ReadMe.txt +28 -0
  3. app/code/local/Pb/Pbgsp/Block/Adminhtml/Categorysettings.php +5 -4
  4. app/code/local/Pb/Pbgsp/Block/Adminhtml/Categorysettings/Grid.php +4 -4
  5. app/code/local/Pb/Pbgsp/Block/Adminhtml/Sales/Order/Invoice/Totals.php +3 -3
  6. app/code/local/Pb/Pbgsp/Block/Adminhtml/Sales/Order/Totals.php +3 -3
  7. app/code/local/Pb/Pbgsp/Block/Checkout/Shipping/Method/Available.php +3 -3
  8. app/code/local/Pb/Pbgsp/Block/Form.php +3 -3
  9. app/code/local/Pb/Pbgsp/Block/Sales/Order/Invoice/Totals.php +3 -3
  10. app/code/local/Pb/Pbgsp/Block/Sales/Order/Totals.php +3 -3
  11. app/code/local/Pb/Pbgsp/Helper/Data.php +6 -0
  12. app/code/local/Pb/Pbgsp/Model/Api.php +10 -10
  13. app/code/local/Pb/Pbgsp/Model/Carrier/ShippingMethod.php +7 -3
  14. app/code/local/Pb/Pbgsp/Model/Catalog/Category.php +3 -3
  15. app/code/local/Pb/Pbgsp/Model/Catalog/Cron.php +3 -3
  16. app/code/local/Pb/Pbgsp/Model/Catalog/File.php +109 -29
  17. app/code/local/Pb/Pbgsp/Model/Catalog/Product.php +8 -15
  18. app/code/local/Pb/Pbgsp/Model/Credentials.php +6 -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/Handlingoptions.php +3 -3
  22. app/code/local/Pb/Pbgsp/Model/Helper.php +3 -3
  23. app/code/local/Pb/Pbgsp/Model/Inboundparcel.php +6 -6
  24. app/code/local/Pb/Pbgsp/Model/Invoice/Duty.php +3 -3
  25. app/code/local/Pb/Pbgsp/Model/Messages.php +3 -3
  26. app/code/local/Pb/Pbgsp/Model/Mysql4/Inboundparcel.php +3 -3
  27. app/code/local/Pb/Pbgsp/Model/Mysql4/Inboundparcel/Collection.php +3 -3
  28. app/code/local/Pb/Pbgsp/Model/Mysql4/Ordernumber.php +3 -3
  29. app/code/local/Pb/Pbgsp/Model/Mysql4/Ordernumber/Collection.php +3 -3
  30. app/code/local/Pb/Pbgsp/Model/Mysql4/Variable.php +3 -3
  31. app/code/local/Pb/Pbgsp/Model/Mysql4/Variable/Collection.php +3 -3
  32. app/code/local/Pb/Pbgsp/Model/Observer.php +43 -40
  33. app/code/local/Pb/Pbgsp/Model/Ordernumber.php +3 -3
  34. app/code/local/Pb/Pbgsp/Model/Pdf/Tax.php +3 -3
  35. app/code/local/Pb/Pbgsp/Model/Productattributesource/Productconditions.php +101 -0
  36. app/code/local/Pb/Pbgsp/Model/Quote/Duty.php +3 -3
  37. app/code/local/Pb/Pbgsp/Model/Resource/Mysql4/Setup.php +3 -3
  38. app/code/local/Pb/Pbgsp/Model/Sales/Order/Shipment.php +44 -3
  39. app/code/local/Pb/Pbgsp/Model/Util.php +19 -7
  40. app/code/local/Pb/Pbgsp/Model/Variable.php +3 -3
  41. app/code/local/Pb/Pbgsp/README +0 -2
  42. app/code/local/Pb/Pbgsp/controllers/Adminhtml/CategorysettingsController.php +3 -4
  43. app/code/local/Pb/Pbgsp/data/pb_pbgsp_setup/data-install-1.0.0.php +3 -3
  44. app/code/local/Pb/Pbgsp/etc/config.xml +10 -29
  45. app/code/local/Pb/Pbgsp/etc/config.xml_bk +579 -0
  46. app/code/local/Pb/Pbgsp/etc/system.xml +29 -6
  47. app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php +3 -3
  48. app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.0.0-1.0.1.php +3 -3
  49. app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.1.1-1.1.2.php +3 -3
  50. app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.2.0-1.2.1.php +3 -3
  51. app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.3.0-1.3.1.php +176 -0
  52. package.xml +8 -15
PBGSP_Manual_Catalog_Export.php CHANGED
@@ -34,10 +34,17 @@ class TestClass {
34
  $pbExport->processStatusNotifications();
35
  }
36
 
 
 
 
 
 
37
  }
38
  if(isset($argv) && count($argv) > 1) {
39
  if($argv[1] == '1')
40
  TestClass::testProcessNotification();
 
 
41
  }
42
  else {
43
  TestClass::TestExport();
34
  $pbExport->processStatusNotifications();
35
  }
36
 
37
+ public static function testAsnGeneration() {
38
+ $pbAsnCron = Mage::getModel('pb_pbgsp/inboundparcel');
39
+ $pbAsnCron->generateInboundParcelPreAdviceCron();
40
+ }
41
+
42
  }
43
  if(isset($argv) && count($argv) > 1) {
44
  if($argv[1] == '1')
45
  TestClass::testProcessNotification();
46
+ else if($argv[1] == '2')
47
+ TestClass::testAsnGeneration();
48
  }
49
  else {
50
  TestClass::TestExport();
ReadMe.txt CHANGED
@@ -32,6 +32,34 @@ In order to take advantage of the file encryption setting in the extension confi
32
  CHANGELOG
33
  ========================================================
34
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
35
  v. 1.3.0
36
 
37
  Added admin interface for managing categories to be exported in the catalog. Store managers can now quickly enable and disable categories to be exported to PB.
32
  CHANGELOG
33
  ========================================================
34
 
35
+ v. 1.3.2
36
+
37
+ Check for valid Magento order for ASN generation. Fixed an issue where if there was a problem at checkout, like credit card not working, an entry was created with the PB Order # but no Magento order #. The job that generates ASN will crash when it discovers these orphaned entries. If a valid magento order number isn’t generated at the time of order, an ASN will not be generated for the order.
38
+
39
+ Cleaned up the get group details functionality to remove warning notice in logs.
40
+
41
+ Integrated PB in carrier list for tracking details. Customer no longer sees the "custom value" title but more accurately sees the "PB INTERNATIONAL SHIPPING" carrier.
42
+
43
+
44
+
45
+ v. 1.3.1
46
+
47
+ Removed the PGP encryption functionality as it is no longer required.
48
+
49
+ Added a configurable value to enable/disable logging of the extension.
50
+
51
+ Add "operation" logic to the catalog export file name for "delete" status
52
+
53
+ Fixed issue in Magento Enterprise <=1.12 and Community <=1.7 were looking for the Varien_Data_Form_Element_Datetime object which did not exist in that version of the software. The fix uses an alternative for date time for pre-builds.
54
+
55
+ Added a commodity configurable value to allow the store manager to choose the condition of the commodity (new, used, refurbished) This new value is now being passed with the catalog export.
56
+
57
+ Added a custom tab on the product detail editor for PB specific content
58
+
59
+ Removed addition of the PB order number as a tracking value in customer order details. PB order number is still used when a tracking number not provided when generating ASN to avoid api error.
60
+
61
+
62
+
63
  v. 1.3.0
64
 
65
  Added admin interface for managing categories to be exported in the catalog. Store managers can now quickly enable and disable categories to be exported to PB.
app/code/local/Pb/Pbgsp/Block/Adminhtml/Categorysettings.php CHANGED
@@ -1,9 +1,10 @@
1
  <?php
2
  /**
3
- * Created by PhpStorm.
4
- * User: Muhammad
5
- * Date: 10/13/2015
6
- * Time: 11:11 PM
 
7
  */
8
 
9
  class Pb_Pbgsp_Block_Adminhtml_Categorysettings extends Mage_Adminhtml_Block_Widget_Grid_Container {
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.2)
4
+ * Packaged: 2016-01-11T11:12:49+00:00
5
+ * Last Modified: 2015-12-18T11:00:00+00:00
6
+
7
+
8
  */
9
 
10
  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,9 +1,9 @@
1
  <?php
2
  /**
3
- * Created by PhpStorm.
4
- * User: Muhammad
5
- * Date: 10/13/2015
6
- * Time: 11:18 PM
7
  */
8
 
9
  class Pb_Pbgsp_Block_Adminhtml_Categorysettings_Grid extends Mage_Adminhtml_Block_Widget_Grid {
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.2)
4
+ * Packaged: 2016-01-11T11:12:49+00:00
5
+ * Last Modified: 2015-12-18T11:00:00+00:00
6
+
7
  */
8
 
9
  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,9 +1,9 @@
1
  <?php
2
 
3
  /**
4
- * Product: Pb_Pbgsp (1.3.0)
5
- * Packaged: 2015-11-12T06:33:00+00:00
6
- * Last Modified: 2015-11-04T12:13:20+00:00
7
 
8
 
9
 
1
  <?php
2
 
3
  /**
4
+ * Product: Pb_Pbgsp (1.3.2)
5
+ * Packaged: 2016-01-11T11:12:49+00:00
6
+ * Last Modified: 2015-12-18T11:00:00+00:00
7
 
8
 
9
 
app/code/local/Pb/Pbgsp/Block/Adminhtml/Sales/Order/Totals.php CHANGED
@@ -1,9 +1,9 @@
1
  <?php
2
 
3
  /**
4
- * Product: Pb_Pbgsp (1.3.0)
5
- * Packaged: 2015-11-12T06:33:00+00:00
6
- * Last Modified: 2015-11-04T12:13:20+00:00
7
 
8
 
9
 
1
  <?php
2
 
3
  /**
4
+ * Product: Pb_Pbgsp (1.3.2)
5
+ * Packaged: 2016-01-11T11:12:49+00:00
6
+ * Last Modified: 2015-12-18T11:00:00+00:00
7
 
8
 
9
 
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.3.0)
5
- * Packaged: 2015-11-12T06:33:00+00:00
6
- * Last Modified: 2015-11-04T12:13:20+00:00
7
 
8
 
9
 
1
  <?php
2
 
3
  /**
4
+ * Product: Pb_Pbgsp (1.3.2)
5
+ * Packaged: 2016-01-11T11:12:49+00:00
6
+ * Last Modified: 2015-12-18T11:00:00+00:00
7
 
8
 
9
 
app/code/local/Pb/Pbgsp/Block/Form.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.0)
4
- * Packaged: 2015-11-12T06:33:00+00:00
5
- * Last Modified: 2015-11-04T12:13:20+00:00
6
 
7
 
8
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.2)
4
+ * Packaged: 2016-01-11T11:12:49+00:00
5
+ * Last Modified: 2015-12-18T11:00:00+00:00
6
 
7
 
8
 
app/code/local/Pb/Pbgsp/Block/Sales/Order/Invoice/Totals.php CHANGED
@@ -1,9 +1,9 @@
1
  <?php
2
 
3
  /**
4
- * Product: Pb_Pbgsp (1.3.0)
5
- * Packaged: 2015-11-12T06:33:00+00:00
6
- * Last Modified: 2015-11-04T12:13:20+00:00
7
 
8
 
9
 
1
  <?php
2
 
3
  /**
4
+ * Product: Pb_Pbgsp (1.3.2)
5
+ * Packaged: 2016-01-11T11:12:49+00:00
6
+ * Last Modified: 2015-12-18T11:00:00+00:00
7
 
8
 
9
 
app/code/local/Pb/Pbgsp/Block/Sales/Order/Totals.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.0)
4
- * Packaged: 2015-11-12T06:33:00+00:00
5
- * Last Modified: 2015-11-04T12:13:20+00:00
6
 
7
 
8
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.2)
4
+ * Packaged: 2016-01-11T11:12:49+00:00
5
+ * Last Modified: 2015-12-18T11:00:00+00:00
6
 
7
 
8
 
app/code/local/Pb/Pbgsp/Helper/Data.php CHANGED
@@ -1,4 +1,10 @@
1
  <?php
 
 
 
 
 
 
2
 
3
  class Pb_Pbgsp_Helper_Data extends Mage_Core_Helper_Abstract
4
  {
1
  <?php
2
+ /**
3
+ * Product: Pb_Pbgsp (1.3.2)
4
+ * Packaged: 2016-01-11T11:12:49+00:00
5
+ * Last Modified: 2015-12-18T11:00:00+00:00
6
+
7
+ */
8
 
9
  class Pb_Pbgsp_Helper_Data extends Mage_Core_Helper_Abstract
10
  {
app/code/local/Pb/Pbgsp/Model/Api.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.0)
4
- * Packaged: 2015-11-12T06:33:00+00:00
5
- * Last Modified: 2015-11-04T12:13:20+00:00
6
 
7
 
8
 
@@ -298,13 +298,13 @@ class Pb_Pbgsp_Model_Api
298
  $title = 'PB';
299
 
300
  // add the tracking info magento
301
- $track = Mage::getModel('sales/order_shipment_track')
302
- ->setShipment($shipment)
303
- ->setData('title', 'PB')
304
- ->setData('number',$cpOrderNumber)
305
- ->setData('carrier_code', 'custom')
306
- ->setData('order_id', $shipment->getData('order_id'))
307
- ->save();
308
  }
309
 
310
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.2)
4
+ * Packaged: 2016-01-11T11:12:49+00:00
5
+ * Last Modified: 2015-12-18T11:00:00+00:00
6
 
7
 
8
 
298
  $title = 'PB';
299
 
300
  // add the tracking info magento
301
+ // $track = Mage::getModel('sales/order_shipment_track')
302
+ // ->setShipment($shipment)
303
+ // ->setData('title', 'PB')
304
+ // ->setData('number',$cpOrderNumber)
305
+ // ->setData('carrier_code', 'custom')
306
+ // ->setData('order_id', $shipment->getData('order_id'))
307
+ // ->save();
308
  }
309
 
310
 
app/code/local/Pb/Pbgsp/Model/Carrier/ShippingMethod.php CHANGED
@@ -1,9 +1,9 @@
1
  <?php
2
 
3
  /**
4
- * Product: Pb_Pbgsp (1.3.0)
5
- * Packaged: 2015-11-12T06:33:00+00:00
6
- * Last Modified: 2015-11-04T12:13:20+00:00
7
 
8
 
9
 
@@ -322,5 +322,9 @@ class Pb_Pbgsp_Model_Carrier_ShippingMethod extends Mage_Shipping_Model_Carrier_
322
  }
323
  return $totalOrderPrice;
324
  }
 
 
 
 
325
  }
326
  ?>
1
  <?php
2
 
3
  /**
4
+ * Product: Pb_Pbgsp (1.3.2)
5
+ * Packaged: 2016-01-11T11:12:49+00:00
6
+ * Last Modified: 2015-12-18T11:00:00+00:00
7
 
8
 
9
 
322
  }
323
  return $totalOrderPrice;
324
  }
325
+
326
+ public function isTrackingAvailable(){
327
+ return true;
328
+ }
329
  }
330
  ?>
app/code/local/Pb/Pbgsp/Model/Catalog/Category.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.0)
4
- * Packaged: 2015-11-12T06:33:00+00:00
5
- * Last Modified: 2015-11-04T12:13:20+00:00
6
 
7
 
8
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.2)
4
+ * Packaged: 2016-01-11T11:12:49+00:00
5
+ * Last Modified: 2015-12-18T11:00:00+00:00
6
 
7
 
8
 
app/code/local/Pb/Pbgsp/Model/Catalog/Cron.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.0)
4
- * Packaged: 2015-11-12T06:33:00+00:00
5
- * Last Modified: 2015-11-04T12:13:20+00:00
6
 
7
 
8
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.2)
4
+ * Packaged: 2016-01-11T11:12:49+00:00
5
+ * Last Modified: 2015-12-18T11:00:00+00:00
6
 
7
 
8
 
app/code/local/Pb/Pbgsp/Model/Catalog/File.php CHANGED
@@ -1,9 +1,9 @@
1
  <?php
2
 
3
  /**
4
- * Product: Pb_Pbgsp (1.3.0)
5
- * Packaged: 2015-11-12T06:33:00+00:00
6
- * Last Modified: 2015-11-04T12:13:20+00:00
7
 
8
 
9
 
@@ -20,10 +20,12 @@ class Pb_Pbgsp_Model_Catalog_File {
20
  private $productIds;
21
  private $lastFileName;
22
  private $uploadedCategories;
 
23
  public function __construct($lastDiff = false) {
24
  $this->lastDiff = $lastDiff;
25
  $this->productIds = array();
26
  $this->uploadedCategories = array();
 
27
  }
28
 
29
  private function _getTempDir() {
@@ -37,19 +39,19 @@ class Pb_Pbgsp_Model_Catalog_File {
37
  }
38
 
39
 
40
- private function _getDataFileName($dataFeedName,$part=null) {
41
  $partName = '';
42
  if($part)
43
  $partName = '_'.str_pad($part, 5, "0", STR_PAD_LEFT);
44
- $fileName = Pb_Pbgsp_Model_Credentials::getCatalogSenderID() . "_".$dataFeedName."_update_". Pb_Pbgsp_Model_Credentials::getPBID().'_'.date('Ymd_His').'_'.mt_rand(100000, 999999);
45
  if($part == 1)
46
  $this->lastFileName = $fileName;
47
  else
48
  $fileName = $this->lastFileName;
49
  return $fileName.$partName.'.csv';
50
  }
51
- private function _createNewCommoditiyFile($part=null) {
52
- $fileName = $this->_getDataFileName('catalog',$part);
53
 
54
 
55
  $this->filename = $this->_getTempDir().$fileName;
@@ -110,6 +112,7 @@ class Pb_Pbgsp_Model_Catalog_File {
110
  $secDefaultStoreUrl = str_replace("http","https",$defaultStoreUrl);
111
  $disabledStores = array();
112
  $addedCategories = array();
 
113
  $part=1;
114
  foreach($stores as $store) {
115
 
@@ -217,6 +220,9 @@ class Pb_Pbgsp_Model_Catalog_File {
217
  ->addAttributeToSelect('url_in_store')
218
  ->addAttributeToSelect('pb_pbgsp_upload')
219
  ->addAttributeToSelect('updated_at')
 
 
 
220
  // ->addUrlRewrite($category->getId()) //this will add the url rewrite.
221
  ->addAttributeToSelect('price')
222
  ->addAttributeToSelect('weight');
@@ -249,38 +255,73 @@ class Pb_Pbgsp_Model_Catalog_File {
249
  /** @var $childProduct Mage_Catalog_Model_Product */
250
 
251
  foreach($allowedProducts as $childProduct) {
252
- if(!array_key_exists($childProduct->getSku(),$addedProducts)) {
253
- if( $fileRecordCount > $maxRecordsCount)
254
- {
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
255
  $this->_createNewCommoditiyFile($part);
256
- $fileRecordCount=0;
257
  $part++;
258
  }
259
- $pbChildProduct = new Pb_Pbgsp_Model_Catalog_Product($childProduct->getId(),sprintf($productUrlFormat,$product->getId()));
260
- $this->writeProduct($pbChildProduct,$cateId,$product->getSku(),$prodCat);
261
- $addedProducts[$childProduct->getSku()] = "added";
262
  $prodCount++;
263
  $fileRecordCount++;
 
 
264
  }
265
  }
266
- }
267
- else {
268
- if(!array_key_exists($product->getSku(),$addedProducts)) {
269
- $pbProduct = new Pb_Pbgsp_Model_Catalog_Product($product,sprintf($productUrlFormat,$product->getId()));
270
- if( $fileRecordCount > $maxRecordsCount)
271
- {
272
- $this->_createNewCommoditiyFile($part);
273
- $fileRecordCount=0;
274
- $part++;
 
 
 
 
275
  }
276
- $this->writeProduct($pbProduct,$cateId,null,$prodCat);
277
- $prodCount++;
278
- $fileRecordCount++;
279
- $addedProducts[$product->getSku()] = "added";
280
 
281
  }
282
 
283
-
284
  }
285
 
286
 
@@ -296,6 +337,33 @@ class Pb_Pbgsp_Model_Catalog_File {
296
  fflush($this->file);
297
 
298
  $this->_stripPartFromFileName($part);
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
299
  if(count($this->productIds) == 0) {
300
  $this->_removeExportedFilesByeType('catalog');
301
  }
@@ -342,6 +410,7 @@ class Pb_Pbgsp_Model_Catalog_File {
342
  //Pb_Pbgsp_Model_Util::log('Updating product '. $product->getSKU());
343
  $product->unlockAttribute('pb_pbgsp_upload');
344
  $product->setPbPbgspUpload(time());
 
345
  try{
346
  $product->save();
347
  $updated++;
@@ -351,6 +420,17 @@ class Pb_Pbgsp_Model_Catalog_File {
351
 
352
  //Pb_Pbgsp_Model_Util::log($product->getId()." ".$product->getName()." ".$product->getPbPbgspUpload());
353
  }
 
 
 
 
 
 
 
 
 
 
 
354
  Pb_Pbgsp_Model_Util::log("$updated products' pb_pbgsp_upload updated");
355
  }
356
 
@@ -602,7 +682,7 @@ class Pb_Pbgsp_Model_Catalog_File {
602
  try {
603
 
604
  if(Pb_Pbgsp_Model_Credentials::isEncryptionEnabled()) {
605
- $exportedFiles = $this->_encryptExportedFiles($exportedFiles);
606
  }
607
  else {
608
  Pb_Pbgsp_Model_Util::log('Encryption is not enabled.'.Pb_Pbgsp_Model_Credentials::isEncryptionEnabled());
1
  <?php
2
 
3
  /**
4
+ * Product: Pb_Pbgsp (1.3.2)
5
+ * Packaged: 2016-01-11T11:12:49+00:00
6
+ * Last Modified: 2015-12-18T11:00:00+00:00
7
 
8
 
9
 
20
  private $productIds;
21
  private $lastFileName;
22
  private $uploadedCategories;
23
+ private $productsToDelete;
24
  public function __construct($lastDiff = false) {
25
  $this->lastDiff = $lastDiff;
26
  $this->productIds = array();
27
  $this->uploadedCategories = array();
28
+ $this->productsToDelete = array();
29
  }
30
 
31
  private function _getTempDir() {
39
  }
40
 
41
 
42
+ private function _getDataFileName($dataFeedName,$part=null,$operation='update') {
43
  $partName = '';
44
  if($part)
45
  $partName = '_'.str_pad($part, 5, "0", STR_PAD_LEFT);
46
+ $fileName = Pb_Pbgsp_Model_Credentials::getCatalogSenderID() . "_".$dataFeedName."_".$operation."_". Pb_Pbgsp_Model_Credentials::getPBID().'_'.date('Ymd_His').'_'.mt_rand(100000, 999999);
47
  if($part == 1)
48
  $this->lastFileName = $fileName;
49
  else
50
  $fileName = $this->lastFileName;
51
  return $fileName.$partName.'.csv';
52
  }
53
+ private function _createNewCommoditiyFile($part=null,$operation='update') {
54
+ $fileName = $this->_getDataFileName('catalog',$part,$operation);
55
 
56
 
57
  $this->filename = $this->_getTempDir().$fileName;
112
  $secDefaultStoreUrl = str_replace("http","https",$defaultStoreUrl);
113
  $disabledStores = array();
114
  $addedCategories = array();
115
+
116
  $part=1;
117
  foreach($stores as $store) {
118
 
220
  ->addAttributeToSelect('url_in_store')
221
  ->addAttributeToSelect('pb_pbgsp_upload')
222
  ->addAttributeToSelect('updated_at')
223
+ ->addAttributeToSelect('pb_pbgsp_product_condition')
224
+ ->addAttributeToSelect('pb_pbgsp_upload_delete')
225
+ ->addAttributeToSelect('pb_pbgsp_upload_deleted_on')
226
  // ->addUrlRewrite($category->getId()) //this will add the url rewrite.
227
  ->addAttributeToSelect('price')
228
  ->addAttributeToSelect('weight');
255
  /** @var $childProduct Mage_Catalog_Model_Product */
256
 
257
  foreach($allowedProducts as $childProduct) {
258
+ if(!$childProduct->getPbPbgspUploadDelete()) {
259
+ if(!array_key_exists($childProduct->getSku(),$addedProducts)) {
260
+ if( $fileRecordCount > $maxRecordsCount)
261
+ {
262
+ $this->_createNewCommoditiyFile($part);
263
+ $fileRecordCount=0;
264
+ $part++;
265
+ }
266
+ $pbChildProduct = new Pb_Pbgsp_Model_Catalog_Product($childProduct->getId(),sprintf($productUrlFormat,$product->getId()));
267
+ $this->writeProduct($pbChildProduct,$cateId,$product->getSku(),$prodCat);
268
+ $addedProducts[$childProduct->getSku()] = "added";
269
+ $prodCount++;
270
+ $fileRecordCount++;
271
+ }
272
+ }
273
+ else {
274
+ Mage::log("delete product ".$childProduct->getSku());
275
+ if(!$childProduct->getPbPbgspUploadDeletedOn()) {
276
+ if(!array_key_exists($childProduct->getSku(),$this->productsToDelete)) {
277
+ $this->productsToDelete[$childProduct->getSku()] = array('product' => $childProduct,
278
+ 'pbproduct' => new Pb_Pbgsp_Model_Catalog_Product($childProduct->getId(),sprintf($productUrlFormat,$product->getId())),
279
+ 'catid' => $cateId,
280
+ 'category' => $prodCat,
281
+ 'parentSku' => $product->getSku());
282
+ }
283
+
284
+ }
285
+ else {
286
+ Mage::log("product already deleted ".$childProduct->getSku());
287
+ }
288
+
289
+ }
290
+ }
291
+ }
292
+ else {
293
+ if(!$product->getPbPbgspUploadDelete()) {
294
+ if (!array_key_exists($product->getSku(), $addedProducts)) {
295
+ $pbProduct = new Pb_Pbgsp_Model_Catalog_Product($product, sprintf($productUrlFormat, $product->getId()));
296
+ if ($fileRecordCount > $maxRecordsCount) {
297
  $this->_createNewCommoditiyFile($part);
298
+ $fileRecordCount = 0;
299
  $part++;
300
  }
301
+ $this->writeProduct($pbProduct, $cateId, null, $prodCat);
 
 
302
  $prodCount++;
303
  $fileRecordCount++;
304
+ $addedProducts[$product->getSku()] = "added";
305
+
306
  }
307
  }
308
+ else {
309
+ Mage::log("delete product ".$product->getSku());
310
+ if(!$product->getPbPbgspUploadDeletedOn()) {
311
+ if(!array_key_exists($product->getSku(),$this->productsToDelete)) {
312
+ $this->productsToDelete[$product->getSku()] = array('product' => $product,
313
+ 'pbproduct' => new Pb_Pbgsp_Model_Catalog_Product($product->getId(),sprintf($productUrlFormat,$product->getId())),
314
+ 'catid' => $cateId,
315
+ 'category' => $prodCat,
316
+ 'parentSku' => $product->getSku());
317
+ }
318
+ }
319
+ else {
320
+ Mage::log("product already deleted ".$product->getSku());
321
  }
 
 
 
 
322
 
323
  }
324
 
 
325
  }
326
 
327
 
337
  fflush($this->file);
338
 
339
  $this->_stripPartFromFileName($part);
340
+
341
+ if(count($this->productsToDelete) > 0) {
342
+ if($this->file)
343
+ fclose($this->file);
344
+
345
+
346
+ $fileRecordCount=0;
347
+ $part=1;
348
+ $this->_createNewCommoditiyFile($part,'delete');
349
+ $part++;
350
+ foreach($this->productsToDelete as $key => $prodData) {
351
+ $product = $prodData['product'];
352
+ $pbProduct = $prodData['pbproduct'];
353
+ $catId = $prodData['catid'];
354
+ $cat = $prodData['category'];
355
+ $parentSku = $prodData['parentSku'];
356
+ if ($fileRecordCount > $maxRecordsCount) {
357
+ $this->_createNewCommoditiyFile($part,'delete');
358
+ $fileRecordCount = 0;
359
+ $part++;
360
+ }
361
+ $pbProduct->writeToFile($this->file,$catId,$parentSku,$cat);
362
+ $fileRecordCount++;
363
+ fflush($this->file);
364
+ }
365
+ $this->_stripPartFromFileName($part);
366
+ }
367
  if(count($this->productIds) == 0) {
368
  $this->_removeExportedFilesByeType('catalog');
369
  }
410
  //Pb_Pbgsp_Model_Util::log('Updating product '. $product->getSKU());
411
  $product->unlockAttribute('pb_pbgsp_upload');
412
  $product->setPbPbgspUpload(time());
413
+ $product->setPbPbgspUploadDeletedOn(null);
414
  try{
415
  $product->save();
416
  $updated++;
420
 
421
  //Pb_Pbgsp_Model_Util::log($product->getId()." ".$product->getName()." ".$product->getPbPbgspUpload());
422
  }
423
+ //update deleted products
424
+ foreach($this->productsToDelete as $prodData) {
425
+ $product = $prodData['product'];
426
+ $product->setPbPbgspUploadDeletedOn(time());
427
+ try{
428
+ $product->save();
429
+
430
+ }catch(Exception $e){
431
+ Pb_Pbgsp_Model_Util::log("There was a problem saving the product with sku ". $product->getSku() ." Error Message \n" . $e->getMessage());
432
+ }
433
+ }
434
  Pb_Pbgsp_Model_Util::log("$updated products' pb_pbgsp_upload updated");
435
  }
436
 
682
  try {
683
 
684
  if(Pb_Pbgsp_Model_Credentials::isEncryptionEnabled()) {
685
+ // $exportedFiles = $this->_encryptExportedFiles($exportedFiles);
686
  }
687
  else {
688
  Pb_Pbgsp_Model_Util::log('Encryption is not enabled.'.Pb_Pbgsp_Model_Credentials::isEncryptionEnabled());
app/code/local/Pb/Pbgsp/Model/Catalog/Product.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.0)
4
- * Packaged: 2015-11-12T06:33:00+00:00
5
- * Last Modified: 2015-11-04T12:13:20+00:00
6
 
7
 
8
 
@@ -131,11 +131,6 @@ class Pb_Pbgsp_Model_Catalog_Product {
131
  $name = Pb_Pbgsp_Model_Catalog_File::stripHtml($this -> getName());
132
  $shortDescription ='';
133
  $name = preg_replace("/[^A-Za-z0-9 ,.\-\+=;:\\(){}\[\]@?%$#]/", '', $name);
134
- $string = "<Commodity>\n";
135
- $string .= "<CategoryCode><![CDATA[" . htmlentities($categoryCode) . "]]></CategoryCode>\n";
136
- $string .= "<SKU><![CDATA[" . htmlentities($this -> getSKU()) . "]]></SKU>\n";
137
- $string .= "<Name><![CDATA[" . htmlentities($name) . "]]></Name>\n";
138
- $string .= "<CountryOfOrigin><![CDATA[" . htmlentities(preg_replace("/[^A-Za-z0-9]/",'',$this -> getCountryOfOrigin())) . "]]></CountryOfOrigin>\n"; //added by kamran,1/14/2012
139
  $description = Pb_Pbgsp_Model_Catalog_File::stripHtml($this -> getDescription());
140
  $description = preg_replace("/[^A-Za-z0-9 .\-\+=;:\\(){}\[\]@?%$#]/", '', $description);
141
  if (strlen($description) >= 2000) {
@@ -149,13 +144,8 @@ class Pb_Pbgsp_Model_Catalog_Product {
149
 
150
  $shortDescription = $this -> chopString($shortDescription, 1999);
151
  }
152
- $string .= "<Description><![CDATA[" . $description . "]]></Description>\n";
153
- $string .= "<URL><![CDATA[" . htmlentities($this -> getURL()) . "]]></URL>\n";
154
 
155
- if ($this->getWeight() != null) {
156
- $string .= "<Size><Weight><![CDATA[" . $this -> getWeight() . "]]></Weight><Source><![CDATA[" . Pb_Pbgsp_Model_Credentials::getMerchantCode() . "]]></Source></Size>\n";
157
- }
158
- $string .= "</Commodity>\n";
159
  // fputcsv($this->file,array('MERCHANT_COMMODITY_REF_ID','COMMODITY_NAME_TITLE','SHORT_DESCRIPTION',
160
  // 'LONG_DESCRIPTION','RETAILER_ID','COMMODITY_URL','RETAILER_UNIQUE_ID','PCH_CATEGORY_ID',
161
  // 'RH_CATEGORY_ID','STANDARD_PRICE','WEIGHT_UNIT','DISTANCE_UNIT','COO','IMAGE_URL','PARENT_SKU',
@@ -175,7 +165,7 @@ class Pb_Pbgsp_Model_Catalog_Product {
175
  }
176
  fputcsv($file,array($this -> getSKU(),$name,$shortDescription,$description,$merchantCode,$this -> getURL(),$merchantCode,'',$categoryCode,$this->getPrice(),'lb','',$this->getCountryOfOrigin(),'','',
177
  '','','','','','','','','',
178
- '','','','',
179
  '','','','','',
180
  '','','','','','',
181
  '','','','',
@@ -185,6 +175,9 @@ class Pb_Pbgsp_Model_Catalog_Product {
185
  //fwrite($file, $string);
186
  }
187
 
 
 
 
188
  /**
189
  * @param $lastDiff
190
  * @return bool
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.2)
4
+ * Packaged: 2016-01-11T11:12:49+00:00
5
+ * Last Modified: 2015-12-18T11:00:00+00:00
6
 
7
 
8
 
131
  $name = Pb_Pbgsp_Model_Catalog_File::stripHtml($this -> getName());
132
  $shortDescription ='';
133
  $name = preg_replace("/[^A-Za-z0-9 ,.\-\+=;:\\(){}\[\]@?%$#]/", '', $name);
 
 
 
 
 
134
  $description = Pb_Pbgsp_Model_Catalog_File::stripHtml($this -> getDescription());
135
  $description = preg_replace("/[^A-Za-z0-9 .\-\+=;:\\(){}\[\]@?%$#]/", '', $description);
136
  if (strlen($description) >= 2000) {
144
 
145
  $shortDescription = $this -> chopString($shortDescription, 1999);
146
  }
 
 
147
 
148
+
 
 
 
149
  // fputcsv($this->file,array('MERCHANT_COMMODITY_REF_ID','COMMODITY_NAME_TITLE','SHORT_DESCRIPTION',
150
  // 'LONG_DESCRIPTION','RETAILER_ID','COMMODITY_URL','RETAILER_UNIQUE_ID','PCH_CATEGORY_ID',
151
  // 'RH_CATEGORY_ID','STANDARD_PRICE','WEIGHT_UNIT','DISTANCE_UNIT','COO','IMAGE_URL','PARENT_SKU',
165
  }
166
  fputcsv($file,array($this -> getSKU(),$name,$shortDescription,$description,$merchantCode,$this -> getURL(),$merchantCode,'',$categoryCode,$this->getPrice(),'lb','',$this->getCountryOfOrigin(),'','',
167
  '','','','','','','','','',
168
+ '','',$this->getProductCondition(),'',
169
  '','','','','',
170
  '','','','','','',
171
  '','','','',
175
  //fwrite($file, $string);
176
  }
177
 
178
+ public function getProductCondition() {
179
+ return $this -> product -> getPbPbgspProductCondition();
180
+ }
181
  /**
182
  * @param $lastDiff
183
  * @return bool
app/code/local/Pb/Pbgsp/Model/Credentials.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.0)
4
- * Packaged: 2015-11-12T06:33:00+00:00
5
- * Last Modified: 2015-11-04T12:13:20+00:00
6
 
7
 
8
 
@@ -154,5 +154,8 @@ class Pb_Pbgsp_Model_Credentials {
154
  public static function getReturnAddressZip() {
155
  return Mage::getStoreConfig('carriers/pbgsp/return_address_zip');
156
  }
 
 
 
157
  }
158
  ?>
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.2)
4
+ * Packaged: 2016-01-11T11:12:49+00:00
5
+ * Last Modified: 2015-12-18T11:00:00+00:00
6
 
7
 
8
 
154
  public static function getReturnAddressZip() {
155
  return Mage::getStoreConfig('carriers/pbgsp/return_address_zip');
156
  }
157
+ public static function isLoggingEnabled() {
158
+ return Mage::getStoreConfig('carriers/pbgsp/enablelogging');
159
+ }
160
  }
161
  ?>
app/code/local/Pb/Pbgsp/Model/Creditmemo/Duty.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.0)
4
- * Packaged: 2015-11-12T06:33:00+00:00
5
- * Last Modified: 2015-11-04T12:13:20+00:00
6
 
7
 
8
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.2)
4
+ * Packaged: 2016-01-11T11:12:49+00:00
5
+ * Last Modified: 2015-12-18T11:00:00+00:00
6
 
7
 
8
 
app/code/local/Pb/Pbgsp/Model/Environmentconfig.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.0)
4
- * Packaged: 2015-11-12T06:33:00+00:00
5
- * Last Modified: 2015-11-04T12:13:20+00:00
6
 
7
 
8
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.2)
4
+ * Packaged: 2016-01-11T11:12:49+00:00
5
+ * Last Modified: 2015-12-18T11:00:00+00:00
6
 
7
 
8
 
app/code/local/Pb/Pbgsp/Model/Handlingoptions.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.0)
4
- * Packaged: 2015-11-12T06:33:00+00:00
5
- * Last Modified: 2015-11-04T12:13:20+00:00
6
 
7
 
8
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.2)
4
+ * Packaged: 2016-01-11T11:12:49+00:00
5
+ * Last Modified: 2015-12-18T11:00:00+00:00
6
 
7
 
8
 
app/code/local/Pb/Pbgsp/Model/Helper.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.0)
4
- * Packaged: 2015-11-12T06:33:00+00:00
5
- * Last Modified: 2015-11-04T12:13:20+00:00
6
 
7
 
8
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.2)
4
+ * Packaged: 2016-01-11T11:12:49+00:00
5
+ * Last Modified: 2015-12-18T11:00:00+00:00
6
 
7
 
8
 
app/code/local/Pb/Pbgsp/Model/Inboundparcel.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.0)
4
- * Packaged: 2015-11-12T06:33:00+00:00
5
- * Last Modified: 2015-11-04T12:13:20+00:00
6
 
7
 
8
 
@@ -46,7 +46,7 @@ class Pb_Pbgsp_Model_Inboundparcel extends Mage_Core_Model_Abstract {
46
  $cpOrderNumber = $clearPathOrder['cp_order_number'];
47
  $order = Mage::getModel('sales/order')->loadByIncrementId($orderID);
48
 
49
- if(($order->hasShipments()) && ($order['status'] != 'canceled')){
50
 
51
  $shipmentCollection = Mage::getResourceModel('sales/order_shipment_collection')->setOrderFilter($order)->load();
52
 
@@ -87,10 +87,10 @@ class Pb_Pbgsp_Model_Inboundparcel extends Mage_Core_Model_Abstract {
87
  ->setShipment($shipment)
88
  ->setData('title', 'PB')
89
  ->setData('number',$parcelResponse['parcelIdentifier'])
90
- ->setData('carrier_code', 'custom')
91
  ->setData('order_id', $shipment->getData('order_id'))
92
  ->save();
93
-
94
  Pb_Pbgsp_Model_Util::log($parcelResponse['parcelIdentifier']."Inbound Parcel Number Saved");
95
  }
96
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.2)
4
+ * Packaged: 2016-01-11T11:12:49+00:00
5
+ * Last Modified: 2015-12-18T11:00:00+00:00
6
 
7
 
8
 
46
  $cpOrderNumber = $clearPathOrder['cp_order_number'];
47
  $order = Mage::getModel('sales/order')->loadByIncrementId($orderID);
48
 
49
+ if(($orderID != '') && ($order->hasShipments()) && ($order['status'] != 'canceled')){
50
 
51
  $shipmentCollection = Mage::getResourceModel('sales/order_shipment_collection')->setOrderFilter($order)->load();
52
 
87
  ->setShipment($shipment)
88
  ->setData('title', 'PB')
89
  ->setData('number',$parcelResponse['parcelIdentifier'])
90
+ ->setData('carrier_code', 'pbgsp')
91
  ->setData('order_id', $shipment->getData('order_id'))
92
  ->save();
93
+
94
  Pb_Pbgsp_Model_Util::log($parcelResponse['parcelIdentifier']."Inbound Parcel Number Saved");
95
  }
96
 
app/code/local/Pb/Pbgsp/Model/Invoice/Duty.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.0)
4
- * Packaged: 2015-11-12T06:33:00+00:00
5
- * Last Modified: 2015-11-04T12:13:20+00:00
6
 
7
 
8
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.2)
4
+ * Packaged: 2016-01-11T11:12:49+00:00
5
+ * Last Modified: 2015-12-18T11:00:00+00:00
6
 
7
 
8
 
app/code/local/Pb/Pbgsp/Model/Messages.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.0)
4
- * Packaged: 2015-11-12T06:33:00+00:00
5
- * Last Modified: 2015-11-04T12:13:20+00:00
6
 
7
 
8
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.2)
4
+ * Packaged: 2016-01-11T11:12:49+00:00
5
+ * Last Modified: 2015-12-18T11:00:00+00:00
6
 
7
 
8
 
app/code/local/Pb/Pbgsp/Model/Mysql4/Inboundparcel.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.0)
4
- * Packaged: 2015-11-12T06:33:00+00:00
5
- * Last Modified: 2015-11-04T12:13:20+00:00
6
 
7
 
8
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.2)
4
+ * Packaged: 2016-01-11T11:12:49+00:00
5
+ * Last Modified: 2015-12-18T11:00:00+00:00
6
 
7
 
8
 
app/code/local/Pb/Pbgsp/Model/Mysql4/Inboundparcel/Collection.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.0)
4
- * Packaged: 2015-11-12T06:33:00+00:00
5
- * Last Modified: 2015-11-04T12:13:20+00:00
6
 
7
 
8
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.2)
4
+ * Packaged: 2016-01-11T11:12:49+00:00
5
+ * Last Modified: 2015-12-18T11:00:00+00:00
6
 
7
 
8
 
app/code/local/Pb/Pbgsp/Model/Mysql4/Ordernumber.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.0)
4
- * Packaged: 2015-11-12T06:33:00+00:00
5
- * Last Modified: 2015-11-04T12:13:20+00:00
6
 
7
 
8
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.2)
4
+ * Packaged: 2016-01-11T11:12:49+00:00
5
+ * Last Modified: 2015-12-18T11:00:00+00:00
6
 
7
 
8
 
app/code/local/Pb/Pbgsp/Model/Mysql4/Ordernumber/Collection.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.0)
4
- * Packaged: 2015-11-12T06:33:00+00:00
5
- * Last Modified: 2015-11-04T12:13:20+00:00
6
 
7
 
8
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.2)
4
+ * Packaged: 2016-01-11T11:12:49+00:00
5
+ * Last Modified: 2015-12-18T11:00:00+00:00
6
 
7
 
8
 
app/code/local/Pb/Pbgsp/Model/Mysql4/Variable.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.0)
4
- * Packaged: 2015-11-12T06:33:00+00:00
5
- * Last Modified: 2015-11-04T12:13:20+00:00
6
 
7
 
8
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.2)
4
+ * Packaged: 2016-01-11T11:12:49+00:00
5
+ * Last Modified: 2015-12-18T11:00:00+00:00
6
 
7
 
8
 
app/code/local/Pb/Pbgsp/Model/Mysql4/Variable/Collection.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.0)
4
- * Packaged: 2015-11-12T06:33:00+00:00
5
- * Last Modified: 2015-11-04T12:13:20+00:00
6
 
7
 
8
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.2)
4
+ * Packaged: 2016-01-11T11:12:49+00:00
5
+ * Last Modified: 2015-12-18T11:00:00+00:00
6
 
7
 
8
 
app/code/local/Pb/Pbgsp/Model/Observer.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.0)
4
- * Packaged: 2015-11-12T06:33:00+00:00
5
- * Last Modified: 2015-11-04T12:13:20+00:00
6
 
7
 
8
 
@@ -99,7 +99,7 @@ class Pb_Pbgsp_Model_Observer {
99
  ->setShipment($shipment)
100
  ->setData('title', 'PB')
101
  ->setData('number',$parcelResponse['parcelIdentifier'])
102
- ->setData('carrier_code', 'custom')
103
  ->setData('order_id', $shipment->getData('order_id'))
104
  ->save();
105
 
@@ -354,42 +354,45 @@ class Pb_Pbgsp_Model_Observer {
354
  }
355
 
356
  }
357
- else if('shipping.tracking.popup' == $layoutName) {
358
- if(!Mage::getStoreConfig('carriers/pbgsp/trackinglink'))
359
- return;
360
-
361
- $helper = Mage::helper('shipping');
362
- $data = $helper->decodeTrackingHash($observer->getEvent()->getBlock()->getRequest()->getParam('hash'));
363
-
364
- $orderId = null;
365
- if($data['key'] == 'order_id')
366
- $orderId = $data['id'];
367
- else if($data['key'] == 'ship_id') {
368
- /* @var $model Mage_Sales_Model_Order_Shipment */
369
- $model = Mage::getModel('sales/order_shipment');
370
- $ship = $model->load($data['id']);
371
- $orderId = $model->getOrderId();
372
- }
373
- else if($data['key'] == 'track_id') {
374
- $track = Mage::getModel('sales/order_shipment_track')->load($data['id']);
375
- $orderId = $track->getOrderId();
376
- }
377
- if(!$orderId)
378
- return;
379
- $cpord = $this->_getCPORD(Mage::getModel('sales/order')->load($orderId));
380
- if($cpord) {
381
- $staging = 0;
382
- if(strpos(Pb_Pbgsp_Model_Credentials::getCheckoutUrl(),'cpsandbox'))
383
- $staging = 1;
384
-
385
- $script = "<script lang='javascript'>
386
- window.location = 'http://tracking.ecommerce.pb.com/track/$cpord?staging=$staging';
387
- </script>
388
- ";
389
- $transport['html'] = $script;
390
- }
391
-
392
- }
 
 
 
393
  else
394
  // if( 'checkout.onepage.review' == $layoutName
395
  // || 'checkout.onepage.review.info.totals' == $layoutName
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.2)
4
+ * Packaged: 2016-01-11T11:12:49+00:00
5
+ * Last Modified: 2015-12-18T11:00:00+00:00
6
 
7
 
8
 
99
  ->setShipment($shipment)
100
  ->setData('title', 'PB')
101
  ->setData('number',$parcelResponse['parcelIdentifier'])
102
+ ->setData('carrier_code', 'pbgsp')
103
  ->setData('order_id', $shipment->getData('order_id'))
104
  ->save();
105
 
354
  }
355
 
356
  }
357
+ // else if('shipping.tracking.popup' == $layoutName) {
358
+ // if(!Mage::getStoreConfig('carriers/pbgsp/trackinglink'))
359
+ // return;
360
+ //
361
+ // $helper = Mage::helper('shipping');
362
+ // $data = $helper->decodeTrackingHash($observer->getEvent()->getBlock()->getRequest()->getParam('hash'));
363
+ //
364
+ // $orderId = null;
365
+ // if($data['key'] == 'order_id')
366
+ // $orderId = $data['id'];
367
+ // else if($data['key'] == 'ship_id') {
368
+ // /* @var $model Mage_Sales_Model_Order_Shipment */
369
+ // $model = Mage::getModel('sales/order_shipment');
370
+ // $ship = $model->load($data['id']);
371
+ // $orderId = $model->getOrderId();
372
+ // }
373
+ // else if($data['key'] == 'track_id') {
374
+ // $track = Mage::getModel('sales/order_shipment_track')->load($data['id']);
375
+ // $orderId = $track->getOrderId();
376
+ // }
377
+ // if(!$orderId)
378
+ // return;
379
+ // $cpord = $this->_getCPORD(Mage::getModel('sales/order')->load($orderId));
380
+ // if($cpord) {
381
+ // if(Mage::getStoreConfig('carriers/pbgsp/suppress_domestic_tracking') == '1') {
382
+ // $staging = 0;
383
+ // if(strpos(Pb_Pbgsp_Model_Credentials::getCheckoutUrl(),'cpsandbox'))
384
+ // $staging = 1;
385
+ //
386
+ // $script = "<script lang='javascript'>
387
+ // window.location = 'http://tracking.ecommerce.pb.com/track/$cpord?staging=$staging';
388
+ // </script>
389
+ // ";
390
+ // $transport['html'] = $script;
391
+ // }
392
+ //
393
+ // }
394
+ //
395
+ // }
396
  else
397
  // if( 'checkout.onepage.review' == $layoutName
398
  // || 'checkout.onepage.review.info.totals' == $layoutName
app/code/local/Pb/Pbgsp/Model/Ordernumber.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.0)
4
- * Packaged: 2015-11-12T06:33:00+00:00
5
- * Last Modified: 2015-11-04T12:13:20+00:00
6
 
7
 
8
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.2)
4
+ * Packaged: 2016-01-11T11:12:49+00:00
5
+ * Last Modified: 2015-12-18T11:00:00+00:00
6
 
7
 
8
 
app/code/local/Pb/Pbgsp/Model/Pdf/Tax.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.0)
4
- * Packaged: 2015-11-12T06:33:00+00:00
5
- * Last Modified: 2015-11-04T12:13:20+00:00
6
 
7
 
8
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.2)
4
+ * Packaged: 2016-01-11T11:12:49+00:00
5
+ * Last Modified: 2015-12-18T11:00:00+00:00
6
 
7
 
8
 
app/code/local/Pb/Pbgsp/Model/Productattributesource/Productconditions.php ADDED
@@ -0,0 +1,101 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Product: Pb_Pbgsp (1.3.2)
4
+ * Packaged: 2016-01-11T11:12:49+00:00
5
+ * Last Modified: 2015-12-18T11:00:00+00:00
6
+
7
+ */
8
+
9
+ class Pb_Pbgsp_Model_Productattributesource_Productconditions extends Mage_Eav_Model_Entity_Attribute_Source_Abstract {
10
+ const NEW_ = 'New';
11
+ const USED = 'Used';
12
+ const REFURBISHED = 'Refurbished';
13
+
14
+ public function getAllOptions()
15
+ {
16
+ if (is_null($this->_options)) {
17
+ $this->_options = array(
18
+ array(
19
+ 'label' => '',
20
+ 'value' => ''
21
+ ),
22
+ array(
23
+ 'label' => Mage::helper('pbgsp')->__('New'),
24
+ 'value' => self::NEW_
25
+ ),
26
+ array(
27
+ 'label' => Mage::helper('pbgsp')->__('Used'),
28
+ 'value' => self::USED
29
+ ),
30
+ array(
31
+ 'label' => Mage::helper('pbgsp')->__('Refurbished'),
32
+ 'value' => self::REFURBISHED
33
+ ),
34
+ );
35
+ }
36
+ return $this->_options;
37
+ }
38
+
39
+ public function toOptionArray()
40
+ {
41
+ return $this->getAllOptions();
42
+ }
43
+
44
+ public function addValueSortToCollection($collection, $dir = 'asc')
45
+ {
46
+ $adminStore = Mage_Core_Model_App::ADMIN_STORE_ID;
47
+ $valueTable1 = $this->getAttribute()->getAttributeCode() . '_t1';
48
+ $valueTable2 = $this->getAttribute()->getAttributeCode() . '_t2';
49
+
50
+ $collection->getSelect()->joinLeft(
51
+ array($valueTable1 => $this->getAttribute()->getBackend()->getTable()),
52
+ "`e`.`entity_id`=`{$valueTable1}`.`entity_id`"
53
+ . " AND `{$valueTable1}`.`attribute_id`='{$this->getAttribute()->getId()}'"
54
+ . " AND `{$valueTable1}`.`store_id`='{$adminStore}'",
55
+ array()
56
+ );
57
+
58
+ if ($collection->getStoreId() != $adminStore) {
59
+ $collection->getSelect()->joinLeft(
60
+ array($valueTable2 => $this->getAttribute()->getBackend()->getTable()),
61
+ "`e`.`entity_id`=`{$valueTable2}`.`entity_id`"
62
+ . " AND `{$valueTable2}`.`attribute_id`='{$this->getAttribute()->getId()}'"
63
+ . " AND `{$valueTable2}`.`store_id`='{$collection->getStoreId()}'",
64
+ array()
65
+ );
66
+ $valueExpr = new Zend_Db_Expr("IF(`{$valueTable2}`.`value_id`>0, `{$valueTable2}`.`value`, `{$valueTable1}`.`value`)");
67
+
68
+ } else {
69
+ $valueExpr = new Zend_Db_Expr("`{$valueTable1}`.`value`");
70
+ }
71
+
72
+
73
+
74
+ $collection->getSelect()
75
+ ->order($valueExpr, $dir);
76
+
77
+ return $this;
78
+ }
79
+
80
+ public function getFlatColums()
81
+ {
82
+ $columns = array(
83
+ $this->getAttribute()->getAttributeCode() => array(
84
+ 'type' => 'varchar',
85
+ 'unsigned' => false,
86
+ 'is_null' => true,
87
+ 'default' => null,
88
+ 'extra' => null
89
+ )
90
+ );
91
+ return $columns;
92
+ }
93
+
94
+
95
+ public function getFlatUpdateSelect($store)
96
+ {
97
+ return Mage::getResourceModel('eav/entity_attribute')
98
+ ->getFlatUpdateSelect($this->getAttribute(), $store);
99
+ }
100
+
101
+ }
app/code/local/Pb/Pbgsp/Model/Quote/Duty.php CHANGED
@@ -1,9 +1,9 @@
1
  <?php
2
 
3
  /**
4
- * Product: Pb_Pbgsp (1.3.0)
5
- * Packaged: 2015-11-12T06:33:00+00:00
6
- * Last Modified: 2015-11-04T12:13:20+00:00
7
 
8
 
9
 
1
  <?php
2
 
3
  /**
4
+ * Product: Pb_Pbgsp (1.3.2)
5
+ * Packaged: 2016-01-11T11:12:49+00:00
6
+ * Last Modified: 2015-12-18T11:00:00+00:00
7
 
8
 
9
 
app/code/local/Pb/Pbgsp/Model/Resource/Mysql4/Setup.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.0)
4
- * Packaged: 2015-11-12T06:33:00+00:00
5
- * Last Modified: 2015-11-04T12:13:20+00:00
6
 
7
 
8
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.2)
4
+ * Packaged: 2016-01-11T11:12:49+00:00
5
+ * Last Modified: 2015-12-18T11:00:00+00:00
6
 
7
 
8
 
app/code/local/Pb/Pbgsp/Model/Sales/Order/Shipment.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.0)
4
- * Packaged: 2015-11-12T06:33:00+00:00
5
- * Last Modified: 2015-11-04T12:13:20+00:00
6
 
7
 
8
 
@@ -139,5 +139,46 @@ class Pb_Pbgsp_Model_Sales_Order_Shipment extends Mage_Sales_Model_Order_Shipmen
139
  return $template;
140
  }
141
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
142
 
143
  }
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.2)
4
+ * Packaged: 2016-01-11T11:12:49+00:00
5
+ * Last Modified: 2015-12-18T11:00:00+00:00
6
 
7
 
8
 
139
  return $template;
140
  }
141
 
142
+ public function getTracksCollection()
143
+ {
144
+
145
+ try {
146
+ $order = $this->getOrder();
147
+ $shipMethod = $order->getShippingMethod();
148
+ $len = strlen("pbgsp_");
149
+ $isCPOrder = false;
150
+ if (strlen($shipMethod) > $len && substr($shipMethod, 0, $len) == "pbgsp_") {
151
+ $isCPOrder = true;
152
+ }
153
+ if(!$this->isAdmin() && $isCPOrder) {
154
+ if(Mage::getStoreConfig('carriers/pbgsp/suppress_domestic_tracking') == '1') {
155
+
156
+ return Mage::getResourceModel('sales/order_shipment_track_collection')
157
+ ->addFieldToFilter('title', 'PB')
158
+ ->setShipmentFilter($this->getId());
159
+ }
160
+ }
161
+ }
162
+ catch(Exception $e) {
163
+ Pb_Pbgsp_Model_Util::logException($e);
164
+ }
165
+
166
+ return parent::getTracksCollection();
167
+ }
168
+
169
+ public function isAdmin()
170
+ {
171
+ if(Mage::app()->getStore()->isAdmin())
172
+ {
173
+ return true;
174
+ }
175
+
176
+ if(Mage::getDesign()->getArea() == 'adminhtml')
177
+ {
178
+ return true;
179
+ }
180
+
181
+ return false;
182
+ }
183
 
184
  }
app/code/local/Pb/Pbgsp/Model/Util.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.0)
4
- * Packaged: 2015-11-12T06:33:00+00:00
5
- * Last Modified: 2015-11-04T12:13:20+00:00
6
 
7
 
8
 
@@ -15,10 +15,22 @@ class Pb_Pbgsp_Model_Util {
15
 
16
  const FILE_NAME = 'pbgsp.log';
17
  public static function log($message) {
18
- if( Mage::getStoreConfig('carriers/pbgsp/separate_log_file'))
19
- Mage::log($message,null,self::FILE_NAME);
20
- else
21
- Mage::log($message);
 
 
 
 
 
 
 
 
 
 
 
 
22
  }
23
  public static function logException($e) {
24
  /* @var Exception $e */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.2)
4
+ * Packaged: 2016-01-11T11:12:49+00:00
5
+ * Last Modified: 2015-12-18T11:00:00+00:00
6
 
7
 
8
 
15
 
16
  const FILE_NAME = 'pbgsp.log';
17
  public static function log($message) {
18
+ //Mage::log('is logging enabled:'.Pb_Pbgsp_Model_Credentials::isLoggingEnabled(),null,self::FILE_NAME);
19
+ if(Pb_Pbgsp_Model_Credentials::isLoggingEnabled()) {
20
+ if( Mage::getStoreConfig('carriers/pbgsp/separate_log_file'))
21
+ Mage::log($message,null,self::FILE_NAME);
22
+ else
23
+ Mage::log($message);
24
+ }
25
+
26
+ // $logDir = Mage::getBaseDir('var') . DS . 'log';
27
+ // $logFile = $logDir . DS . 'test.log';
28
+ // if (!file_exists($logFile)) {
29
+ // file_put_contents($logFile, '');
30
+ // chmod($logFile, 0777);
31
+ // }
32
+ //
33
+ // file_put_contents($logFile, $message. PHP_EOL);
34
  }
35
  public static function logException($e) {
36
  /* @var Exception $e */
app/code/local/Pb/Pbgsp/Model/Variable.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.0)
4
- * Packaged: 2015-11-12T06:33:00+00:00
5
- * Last Modified: 2015-11-04T12:13:20+00:00
6
 
7
 
8
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.2)
4
+ * Packaged: 2016-01-11T11:12:49+00:00
5
+ * Last Modified: 2015-12-18T11:00:00+00:00
6
 
7
 
8
 
app/code/local/Pb/Pbgsp/README DELETED
@@ -1,2 +0,0 @@
1
- Dependencies:
2
- gnupg
 
 
app/code/local/Pb/Pbgsp/controllers/Adminhtml/CategorysettingsController.php CHANGED
@@ -1,9 +1,8 @@
1
  <?php
2
  /**
3
- * Created by PhpStorm.
4
- * User: Muhammad
5
- * Date: 10/14/2015
6
- * Time: 10:50 PM
7
  */
8
 
9
  class Pb_Pbgsp_Adminhtml_CategorysettingsController extends Mage_Adminhtml_Controller_Action {
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.2)
4
+ * Packaged: 2016-01-11T11:12:49+00:00
5
+ * Last Modified: 2015-12-18T11:00: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.3.0)
4
- * Packaged: 2015-11-12T06:33:00+00:00
5
- * Last Modified: 2015-11-04T12:13:20+00:00
6
 
7
 
8
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.2)
4
+ * Packaged: 2016-01-11T11:12:49+00:00
5
+ * Last Modified: 2015-12-18T11:00:00+00:00
6
 
7
 
8
 
app/code/local/Pb/Pbgsp/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <Pb_Pbgsp>
5
- <version>1.3.0</version>
6
  </Pb_Pbgsp>
7
  </modules>
8
  <global>
@@ -204,34 +204,15 @@
204
  </sales_setup>
205
  </resources>
206
 
207
- <!--<frontend>-->
208
- <!--<layout>-->
209
- <!--<updates>-->
210
- <!--<pbcheckout>-->
211
- <!--<file>pbcheckout.xml</file>-->
212
- <!--</pbcheckout>-->
213
- <!--</updates>-->
214
- <!--</layout>-->
215
- <!--<routers>-->
216
- <!--<Pb_Pbgsp>-->
217
- <!--<use>standard</use>-->
218
- <!--<args>-->
219
- <!--<module>Pb_Pbgsp</module>-->
220
- <!--<frontName>pbgsp</frontName>-->
221
- <!--&lt;!&ndash; loads ../controller/IndexController in http://..../magento/index.php/testController &ndash;&gt;-->
222
- <!--</args>-->
223
- <!--</Pb_Pbgsp>-->
224
- <!--</routers>-->
225
- <!--<translate>-->
226
- <!--<modules>-->
227
- <!--<translations>-->
228
- <!--<files>-->
229
- <!--<default>Pb_Pbgsp.csv</default>-->
230
- <!--</files>-->
231
- <!--</translations>-->
232
- <!--</modules>-->
233
- <!--</translate>-->
234
- <!--</frontend>-->
235
 
236
  <default>
237
  <carriers>
2
  <config>
3
  <modules>
4
  <Pb_Pbgsp>
5
+ <version>1.3.1</version>
6
  </Pb_Pbgsp>
7
  </modules>
8
  <global>
204
  </sales_setup>
205
  </resources>
206
 
207
+ <frontend>
208
+ <layout>
209
+ <updates>
210
+ <Pb_Pbgsp>
211
+ <file>pbgsp.xml</file>
212
+ </Pb_Pbgsp>
213
+ </updates>
214
+ </layout>
215
+ </frontend>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
216
 
217
  <default>
218
  <carriers>
app/code/local/Pb/Pbgsp/etc/config.xml_bk ADDED
@@ -0,0 +1,579 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?xml version="1.0"?>
2
+ <config>
3
+ <modules>
4
+ <Pb_Pbgsp>
5
+ <version>1.3.4</version>
6
+ </Pb_Pbgsp>
7
+ </modules>
8
+ <global>
9
+ <!--<template>-->
10
+ <!--<email>-->
11
+ <!--<sales_email_pb_shipment_template>-->
12
+ <!--<label>Pitney Bowes Custom Shipment Email</label>-->
13
+ <!--<file>pbgsp_shipment_new.html</file>-->
14
+ <!--<type>html</type>-->
15
+ <!--</sales_email_pb_shipment_template>-->
16
+ <!--</email>-->
17
+ <!--</template>-->
18
+
19
+ <blocks>
20
+ <PB_Pbgsp>
21
+ <class>Pb_Pbgsp_Block</class>
22
+ </PB_Pbgsp>
23
+ <sales>
24
+ <rewrite>
25
+ <order_totals>Pb_Pbgsp_Block_Sales_Order_Totals</order_totals>
26
+ <order_invoice_totals>Pb_Pbgsp_Block_Sales_Order_Invoice_Totals</order_invoice_totals>
27
+
28
+ </rewrite>
29
+ </sales>
30
+ <adminhtml>
31
+ <rewrite>
32
+ <sales_order_totals>Pb_Pbgsp_Block_Adminhtml_Sales_Order_Totals</sales_order_totals>
33
+ <sales_order_invoice_totals>Pb_Pbgsp_Block_Adminhtml_Sales_Order_Invoice_Totals</sales_order_invoice_totals>
34
+
35
+ </rewrite>
36
+ </adminhtml>
37
+ <checkout>
38
+ <rewrite>
39
+ <onepage_shipping_method_available>Pb_Pbgsp_Block_Checkout_Shipping_Method_Available</onepage_shipping_method_available>
40
+ </rewrite>
41
+ </checkout>
42
+ </blocks>
43
+ <models>
44
+ <pb_pbgsp>
45
+ <class>Pb_Pbgsp_Model</class>
46
+ <resourceModel>pb_pbgsp_mysql4</resourceModel>
47
+ </pb_pbgsp>
48
+ <pb_pbgsp_mysql4>
49
+ <class>Pb_Pbgsp_Model_Mysql4</class>
50
+ <entities>
51
+ <variable>
52
+ <table>pbgsp_variable</table>
53
+ </variable>
54
+ <ordernumber>
55
+ <table>pbgsp_ordernumber</table>
56
+ </ordernumber>
57
+ <inboundparcel>
58
+ <table>pbgsp_inbound_parcel</table>
59
+ </inboundparcel>
60
+ </entities>
61
+ </pb_pbgsp_mysql4>
62
+ <sales>
63
+ <rewrite>
64
+ <order_invoice_total_tax>Pb_Pbgsp_Model_Invoice_Duty</order_invoice_total_tax>
65
+ <order_creditmemo_total_tax>Pb_Pbgsp_Model_Creditmemo_Duty</order_creditmemo_total_tax>
66
+ <order_shipment>Pb_Pbgsp_Model_Sales_Order_Shipment</order_shipment>
67
+ </rewrite>
68
+ </sales>
69
+ </models>
70
+ <resources>
71
+ <pbgsp_setup>
72
+ <setup>
73
+ <module>Pb_Pbgsp</module>
74
+ <class>Pb_Pbgsp_Model_Resource_Mysql4_Setup</class>
75
+ </setup>
76
+ <connection>
77
+ <use>core_setup</use>
78
+ </connection>
79
+ </pbgsp_setup>
80
+ <pb_pbgsp_write>
81
+ <connection>
82
+ <use>core_write</use>
83
+ </connection>
84
+ </pb_pbgsp_write>
85
+ <pb_pbgsp_read>
86
+ <connection>
87
+ <use>core_read</use>
88
+ </connection>
89
+ </pb_pbgsp_read>
90
+ </resources>
91
+ <events>
92
+ <!--<checkout_submit_all_after>&lt;!&ndash; added by Kamran 7/2/2014 &ndash;&gt;-->
93
+ <!--<observers>-->
94
+ <!--<Pb_Pbgsp_Model_CheckoutSubmitAllAfter>-->
95
+ <!--<type>model</type>-->
96
+ <!--<class>pb_pbgsp/observer</class>-->
97
+ <!--<method>createOrderAdminAfter</method>-->
98
+ <!--</Pb_Pbgsp_Model_CheckoutSubmitAllAfter>-->
99
+ <!--</observers>-->
100
+ <!--</checkout_submit_all_after>-->
101
+ <sales_order_shipment_save_after>
102
+ <observers>
103
+ <Pb_Pbgsp_CreateParcel>
104
+ <type>model</type>
105
+ <class>pb_pbgsp/observer</class>
106
+ <method>generateInboundParcelPreAdvice</method>
107
+ </Pb_Pbgsp_CreateParcel>
108
+ </observers>
109
+ </sales_order_shipment_save_after>
110
+
111
+
112
+ <core_block_abstract_to_html_after>
113
+ <observers>
114
+ <Pb_Pbgsp_Model_OrderView>
115
+ <type>model</type>
116
+ <class>pb_pbgsp/observer</class>
117
+ <method>modifyOrderView</method>
118
+ </Pb_Pbgsp_Model_OrderView>
119
+ </observers>
120
+ </core_block_abstract_to_html_after>
121
+ <checkout_controller_onepage_save_shipping_method>
122
+ <observers>
123
+ <Pb_Pbgsp_Model_SaveShippingOne>
124
+ <type>model</type>
125
+ <class>pb_pbgsp/observer</class>
126
+ <method>saveShippingMethod</method>
127
+ </Pb_Pbgsp_Model_SaveShippingOne>
128
+ </observers>
129
+ </checkout_controller_onepage_save_shipping_method>
130
+ <checkout_onepage_controller_success_action>
131
+ <observers>
132
+ <Pb_Pbgsp_Model_CheckoutCompleteOne>
133
+ <type>model</type>
134
+ <class>pb_pbgsp/observer</class>
135
+ <method>createPbOrder</method>
136
+ </Pb_Pbgsp_Model_CheckoutCompleteOne>
137
+ </observers>
138
+ </checkout_onepage_controller_success_action>
139
+ <controller_action_postdispatch_checkout_cart_estimateUpdatePost>
140
+ <observers>
141
+ <Pb_Pbgsp_Estimated_Shipping>
142
+ <type>model</type>
143
+ <class>pb_pbgsp/observer</class>
144
+ <method>addDutiesOnEstimation</method>
145
+ </Pb_Pbgsp_Estimated_Shipping>
146
+ </observers>
147
+ </controller_action_postdispatch_checkout_cart_estimateUpdatePost>
148
+ <catalog_product_load_after>
149
+ <observers>
150
+ <Pb_Pbgsp_Product_Last_Export>
151
+ <type>model</type>
152
+ <class>pb_pbgsp/observer</class>
153
+ <method>productLoadAfter</method>
154
+ </Pb_Pbgsp_Product_Last_Export>
155
+ </observers>
156
+ </catalog_product_load_after>
157
+ <catalog_category_load_after>
158
+ <observers>
159
+ <Pb_Pbgsp_Product_Last_Export>
160
+ <type>model</type>
161
+ <class>pb_pbgsp/observer</class>
162
+ <method>categoryLoadAfter</method>
163
+ </Pb_Pbgsp_Product_Last_Export>
164
+ </observers>
165
+ </catalog_category_load_after>
166
+ </events>
167
+ <sales>
168
+ <quote>
169
+ <totals>
170
+ <tax>
171
+ <class>Pb_Pbgsp_Model_Quote_Duty</class>
172
+ <before>grand_total</before>
173
+ <after>shipping</after>
174
+ </tax>
175
+ </totals>
176
+ </quote>
177
+ </sales>
178
+ <pdf>
179
+ <totals>
180
+ <tax translate="title">
181
+ <title>Tax</title>
182
+ <source_field>tax_amount</source_field>
183
+ <model>pb_pbgsp/pdf_tax</model>
184
+ <font_size>7</font_size>
185
+ <display_zero>0</display_zero>
186
+ <sort_order>300</sort_order>
187
+ </tax>
188
+ </totals>
189
+ </pdf>
190
+
191
+ <helpers>
192
+ <pbgsp>
193
+ <class>Pb_Pbgsp_Helper</class>
194
+ </pbgsp>
195
+
196
+ </helpers>
197
+ </global>
198
+ <resources>
199
+ <sales_setup>
200
+ <setup>
201
+ <module>Pb_Pbgsp</module>
202
+ <class>Pb_Pbgsp_Model_Entity_Setup</class>
203
+ </setup>
204
+ </sales_setup>
205
+ </resources>
206
+
207
+ <!--<frontend>-->
208
+ <!--<layout>-->
209
+ <!--<updates>-->
210
+ <!--<pbcheckout>-->
211
+ <!--<file>pbcheckout.xml</file>-->
212
+ <!--</pbcheckout>-->
213
+ <!--</updates>-->
214
+ <!--</layout>-->
215
+ <!--<routers>-->
216
+ <!--<Pb_Pbgsp>-->
217
+ <!--<use>standard</use>-->
218
+ <!--<args>-->
219
+ <!--<module>Pb_Pbgsp</module>-->
220
+ <!--<frontName>pbgsp</frontName>-->
221
+ <!--&lt;!&ndash; loads ../controller/IndexController in http://..../magento/index.php/testController &ndash;&gt;-->
222
+ <!--</args>-->
223
+ <!--</Pb_Pbgsp>-->
224
+ <!--</routers>-->
225
+ <!--<translate>-->
226
+ <!--<modules>-->
227
+ <!--<translations>-->
228
+ <!--<files>-->
229
+ <!--<default>Pb_Pbgsp.csv</default>-->
230
+ <!--</files>-->
231
+ <!--</translations>-->
232
+ <!--</modules>-->
233
+ <!--</translate>-->
234
+ <!--</frontend>-->
235
+
236
+ <default>
237
+ <carriers>
238
+ <pbgsp>
239
+ <active>1</active>
240
+ <sallowspecific>0</sallowspecific>
241
+ <model>Pb_Pbgsp_Model_Carrier_ShippingMethod</model>
242
+ <specificerrmsg>
243
+ This shipping method is currently unavailable.
244
+ If you would like to ship using this shipping
245
+ method, please contact us.
246
+ </specificerrmsg>
247
+ <handling_type>F</handling_type>
248
+ <catalog_diff>1</catalog_diff>
249
+ <catalog_full>1</catalog_full>
250
+ <catalog_size>10000</catalog_size>
251
+ <catalog_encryption_enabled>0</catalog_encryption_enabled>
252
+ <asn_generation_enabled>1</asn_generation_enabled>
253
+ <suppress_domestic_tracking>1</suppress_domestic_tracking>
254
+ <notify_catalog_ok>0</notify_catalog_ok>
255
+ <notify_catalog_err>1</notify_catalog_err>
256
+ <custom_shipment_email_subject><![CDATA[{{var store.getFrontendName()}}: Shipment confirmation for Order # {{var order.increment_id}}]]>
257
+ </custom_shipment_email_subject>
258
+ <custom_shipment_email_template><![CDATA[<h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;"">Hello, {{htmlescape var=$order.getCustomerName()}}</h1>
259
+ <p style="font-size:12px; line-height:16px; margin:0;">
260
+ Thank you for your order from {{var store.getFrontendName()}}.
261
+ You can check the status of your order by <a href="{{store url="customer/account/"}}" style="color:#1E7EC8;">logging into your account</a>.
262
+
263
+ </p>
264
+ <p style="font-size:12px; line-height:16px; margin:0;">
265
+ Your shipping confirmation is below. Thank you again for your business.
266
+ </p></br>
267
+
268
+ <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
269
+ </h4>
270
+ <p>
271
+ {{var order.getShippingAddress().format('html')}} </p>
272
+
273
+ <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>
274
+
275
+ ]]>
276
+ </custom_shipment_email_template>
277
+ <separate_log_file>0</separate_log_file>
278
+
279
+ <shipping_services>
280
+ <POSTAL_PRIORITY>
281
+ <title>Standard</title>
282
+ <enabled>0</enabled>
283
+ </POSTAL_PRIORITY>
284
+ <FEDEX_ECONOMY>
285
+ <title>Express</title>
286
+ <enabled>1</enabled>
287
+ </FEDEX_ECONOMY>
288
+ <FEDEX_PRIORITY>
289
+ <title>Express Plus</title>
290
+ <enabled>1</enabled>
291
+ </FEDEX_PRIORITY>
292
+ <AE_STANDARD>
293
+ <title>Premier</title>
294
+ <enabled>1</enabled>
295
+ </AE_STANDARD>
296
+ <AU_STANDARD>
297
+ <title>Premier</title>
298
+ <enabled>1</enabled>
299
+ </AU_STANDARD>
300
+ <CN_STANDARD>
301
+ <title>Premier</title>
302
+ <enabled>1</enabled>
303
+ </CN_STANDARD>
304
+ <CPC_EXPRESS>
305
+ <title>Premier Plus</title>
306
+ <enabled>1</enabled>
307
+ </CPC_EXPRESS>
308
+ <CPC_STANDARD>
309
+ <title>Premier</title>
310
+ <enabled>1</enabled>
311
+ </CPC_STANDARD>
312
+ <EU_STANDARD>
313
+ <title>Premier</title>
314
+ <enabled>1</enabled>
315
+ </EU_STANDARD>
316
+ <HK_STANDARD>
317
+ <title>Premier</title>
318
+ <enabled>1</enabled>
319
+ </HK_STANDARD>
320
+ <KR_STANDARD>
321
+ <title>Premier</title>
322
+ <enabled>1</enabled>
323
+ </KR_STANDARD>
324
+ <NZ_STANDARD>
325
+ <title>Premier</title>
326
+ <enabled>1</enabled>
327
+ </NZ_STANDARD>
328
+ <PH_STANDARD>
329
+ <title>Premier</title>
330
+ <enabled>1</enabled>
331
+ </PH_STANDARD>
332
+ <SG_STANDARD>
333
+ <title>Premier</title>
334
+ <enabled>1</enabled>
335
+ </SG_STANDARD>
336
+ <TH_STANDARD>
337
+ <title>Premier</title>
338
+ <enabled>1</enabled>
339
+ </TH_STANDARD>
340
+ <TW_STANDARD>
341
+ <title>Premier</title>
342
+ <enabled>1</enabled>
343
+ </TW_STANDARD>
344
+ </shipping_services>
345
+ <error_messages>
346
+ <_1005001>
347
+ <display>The shipping address is invalid.</display>
348
+ </_1005001>
349
+ <_1005002>
350
+ <display>The consignee information is invalid.</display>
351
+ </_1005002>
352
+ <_1005003>
353
+ <display>The COP transportation information is invalid.</display>
354
+ </_1005003>
355
+ <_1005004>
356
+ <display>The requested return currency is invalid.</display>
357
+ </_1005004>
358
+ <_1005005>
359
+ <display>The request currency is not supported for the target country.</display>
360
+ </_1005005>
361
+ <_1005006>
362
+ <display>The order cannot be shipped by the method selected.</display>
363
+ </_1005006>
364
+ <_1005007>
365
+ <display>The order value has exceeded the allowed value.</display>
366
+ </_1005007>
367
+ <_1005008>
368
+ <display>Invalid fields in parcels.</display>
369
+ </_1005008>
370
+ <_1005009>
371
+ <display>Invalid fields in commoditySources.</display>
372
+ </_1005009>
373
+ <_1005010>
374
+ <display>This basket is over the dollar value for international shipping. Please remove some items before proceeding.</display>
375
+ </_1005010>
376
+ <_1005011>
377
+ <display>There are errors at the Quote Item Level.</display>
378
+ </_1005011>
379
+ <_1005012>
380
+ <display>The order exceeded the weight limit.</display>
381
+ </_1005012>
382
+ <_1005013>
383
+ <display>The shipping address has missing fields.</display>
384
+ </_1005013>
385
+ <_1005014>
386
+ <display>Missing fields in basket.</display>
387
+ </_1005014>
388
+ <_1005015>
389
+ <display>Invalid fields in basket.</display>
390
+ </_1005015>
391
+ <_1005016>
392
+ <display>The consignee information is missing.</display>
393
+ </_1005016>
394
+ <_1005017>
395
+ <display>The COP transportation information is missing.</display>
396
+ </_1005017>
397
+ <_1005018>
398
+ <display>Shipping Speed unavailable.</display>
399
+ </_1005018>
400
+ <_1005018>
401
+ <display>Shipping Speed unavailable.</display>
402
+ </_1005018>
403
+ <_1005019>
404
+ <display>Missing Basket.</display>
405
+ </_1005019>
406
+ <_1005020>
407
+ <display>Missing Parcel Fields.</display>
408
+ </_1005020>
409
+ <_1005021>
410
+ <display>Missing fields in the basket commodity source.</display>
411
+ </_1005021>
412
+ <_1005022>
413
+ <display>Invalid Parcel Fields.</display>
414
+ </_1005022>
415
+ <_1006001>
416
+ <display>The commodity was invalid.</display>
417
+ </_1006001>
418
+ <_1006002>
419
+ <display>The commodity is too large to ship (length, width or height).</display>
420
+ </_1006002>
421
+ <_1006003>
422
+ <display>The commodity cannot be shipped to the COD.</display>
423
+ </_1006003>
424
+ <_1006004>
425
+ <display>The commodity has a negative price.</display>
426
+ </_1006004>
427
+ <_1006005>
428
+ <display>The commodity’s price was too low and did not have a dutiable value.</display>
429
+ </_1006005>
430
+ <_1006006>
431
+ <display>The item price exceeds maximum.</display>
432
+ </_1006006>
433
+ <_1006007>
434
+ <display>Item weight exceeds maximum.</display>
435
+ </_1006007>
436
+ <_1006008>
437
+ <display>Invalid commodity rated data. Commodity cannot be shipped at this time. This is an internal error and should be raised to PB immediately. .</display>
438
+ </_1006008>
439
+ <_1006009>
440
+ <display>The Commodity is restricted for this Country of Destination.</display>
441
+ </_1006009>
442
+ <_10060010>
443
+ <display>Commodity cannot be quoted.</display>
444
+ </_10060010>
445
+ <_10060011>
446
+ <display>Commodity cannot shipped to the address specified.</display>
447
+ </_10060011>
448
+ <_1007001>
449
+ <display>Order value exceeded on this line.</display>
450
+ </_1007001>
451
+ <_1007002>
452
+ <display>Line too large to ship (length, width or height of the shipping box).</display>
453
+ </_1007002>
454
+ <_1007003>
455
+ <display>The quantity is invalid or missing.</display>
456
+ </_1007003>
457
+ <_1007004>
458
+ <display>Weight Value exceeded on this line.</display>
459
+ </_1007004>
460
+ <_1007005>
461
+ <display>Errors in the kitContents.</display>
462
+ </_1007005>
463
+ <_1007006>
464
+ <display>Missing fields in basket line.</display>
465
+ </_1007006>
466
+ <_1007007>
467
+ <display>Invalid fields in basket line.</display>
468
+ </_1007007>
469
+ <_1007008>
470
+ <display>Quantity exceeded for Country of Destination.</display>
471
+ </_1007008>
472
+ </error_messages>
473
+ </pbgsp>
474
+ </carriers>
475
+ </default>
476
+
477
+ <!-- Please modify this part for CRON JOB
478
+ For more information on Magento Cron Job, please visit the following url:
479
+ http://www.magentocommerce.com/wiki/1_-_installation_and_configuration/how_to_setup_a_cron_job#built-in_cron_jobs
480
+ -->
481
+ <crontab>
482
+ <jobs>
483
+ <pb_pbgsp>
484
+ <schedule>
485
+ <cron_expr>30 * * * *</cron_expr>
486
+ </schedule>
487
+ <run>
488
+ <model>pb_pbgsp/catalog_cron::catalogSync</model>
489
+ </run>
490
+ </pb_pbgsp>
491
+ <pb_notifications>
492
+ <schedule>
493
+ <cron_expr>20 * * * *</cron_expr>
494
+ </schedule>
495
+ <run>
496
+ <model>pb_pbgsp/catalog_cron::processStatusNotifications</model>
497
+ </run>
498
+ </pb_notifications>
499
+
500
+ <pb_generateASN>
501
+ <schedule>
502
+ <cron_expr>0 * * * *</cron_expr>
503
+ </schedule>
504
+ <run>
505
+ <model>pb_pbgsp/Inboundparcel::generateInboundParcelPreAdviceCron</model>
506
+ </run>
507
+ </pb_generateASN>
508
+ </jobs>
509
+ </crontab>
510
+
511
+ <admin>
512
+ <routers>
513
+ <pbgsp>
514
+ <use>admin</use>
515
+ <args>
516
+ <module>Pb_Pbgsp</module>
517
+ <frontName>pbgsp</frontName>
518
+ </args>
519
+ </pbgsp>
520
+ </routers>
521
+ </admin>
522
+ <adminhtml>
523
+ <events>
524
+ <!--<sales_order_save_commit_after>-->
525
+ <!--<observers>-->
526
+ <!--<Pb_Pbgsp_CreateParcel>-->
527
+ <!--<type>model</type>-->
528
+ <!--<class>pb_pbgsp/observer</class>-->
529
+ <!--<method>generateInboundParcelPreAdvice</method>-->
530
+ <!--</Pb_Pbgsp_CreateParcel>-->
531
+ <!--</observers>-->
532
+ <!--</sales_order_save_commit_after>-->
533
+
534
+ <order_cancel_after>
535
+ <observers>
536
+ <Pb_Pbgsp_CreateParcel>
537
+ <type>model</type>
538
+ <class>pb_pbgsp/observer</class>
539
+ <method>cancelPbOrder</method>
540
+ </Pb_Pbgsp_CreateParcel>
541
+ </observers>
542
+ </order_cancel_after>
543
+ </events>
544
+
545
+ <menu>
546
+ <pbgsp module="pbgsp">
547
+ <title>PBGSP</title>
548
+ <sort_order>71</sort_order>
549
+ <children>
550
+ <items module="pbgsp">
551
+ <title>Category Settings</title>
552
+ <sort_order>0</sort_order>
553
+ <action>pbgsp/adminhtml_categorysettings</action>
554
+ </items>
555
+ </children>
556
+ </pbgsp>
557
+ </menu>
558
+ <acl>
559
+ <resources>
560
+ <all>
561
+ <title>Allow Everything</title>
562
+ </all>
563
+ <admin>
564
+ <children>
565
+ <Pb_Pbgsp>
566
+ <title>PBGSP Module</title>
567
+ <sort_order>10</sort_order>
568
+ </Pb_Pbgsp>
569
+ </children>
570
+ </admin>
571
+ </resources>
572
+ </acl>
573
+
574
+
575
+
576
+ </adminhtml>
577
+
578
+ </config>
579
+
app/code/local/Pb/Pbgsp/etc/system.xml CHANGED
@@ -212,6 +212,13 @@
212
  <show_in_default>1</show_in_default>
213
  <show_in_website>1</show_in_website>
214
  <show_in_store>1</show_in_store>
 
 
 
 
 
 
 
215
  </catalog_encryption_enabled>
216
  <encryption_public_key translate="label">
217
  <label>Catalog Encryption Public Key</label>
@@ -220,6 +227,13 @@
220
  <show_in_default>1</show_in_default>
221
  <show_in_website>1</show_in_website>
222
  <show_in_store>1</show_in_store>
 
 
 
 
 
 
 
223
  </encryption_public_key>
224
  <notify_catalog_ok translate="label">
225
  <label>Notify on Successful Catalog Export</label>
@@ -434,10 +448,19 @@
434
  <show_in_website>1</show_in_website>
435
  <show_in_store>1</show_in_store>
436
  </custom_shipment_email_template>
 
 
 
 
 
 
 
 
 
437
  <separate_log_file translate="label">
438
  <label>Log in separate file</label>
439
  <frontend_type>select</frontend_type>
440
- <sort_order>283</sort_order>
441
  <frontend_class>shipping-skip-hide</frontend_class>
442
  <source_model>adminhtml/system_config_source_yesno</source_model>
443
  <show_in_default>1</show_in_default>
@@ -448,7 +471,7 @@
448
  <label>Return Address Street 1</label>
449
  <frontend_type>text</frontend_type>
450
 
451
- <sort_order>284</sort_order>
452
  <show_in_default>1</show_in_default>
453
  <show_in_website>1</show_in_website>
454
  <show_in_store>1</show_in_store>
@@ -457,7 +480,7 @@
457
  <label>Return Address City</label>
458
  <frontend_type>text</frontend_type>
459
 
460
- <sort_order>285</sort_order>
461
  <show_in_default>1</show_in_default>
462
  <show_in_website>1</show_in_website>
463
  <show_in_store>1</show_in_store>
@@ -466,7 +489,7 @@
466
  <label>Province/State</label>
467
  <frontend_type>text</frontend_type>
468
 
469
- <sort_order>286</sort_order>
470
  <show_in_default>1</show_in_default>
471
  <show_in_website>1</show_in_website>
472
  <show_in_store>1</show_in_store>
@@ -475,7 +498,7 @@
475
  <label>Country</label>
476
  <frontend_type>select</frontend_type>
477
  <source_model>adminhtml/system_config_source_country</source_model>
478
- <sort_order>287</sort_order>
479
  <show_in_default>1</show_in_default>
480
  <show_in_website>1</show_in_website>
481
  <show_in_store>1</show_in_store>
@@ -484,7 +507,7 @@
484
  <label>Zip or Postal Code</label>
485
  <frontend_type>text</frontend_type>
486
 
487
- <sort_order>288</sort_order>
488
  <show_in_default>1</show_in_default>
489
  <show_in_website>1</show_in_website>
490
  <show_in_store>1</show_in_store>
212
  <show_in_default>1</show_in_default>
213
  <show_in_website>1</show_in_website>
214
  <show_in_store>1</show_in_store>
215
+ <comment><![CDATA[
216
+ <script type='text/javascript'>
217
+ $("row_carriers_pbgsp_catalog_encryption_enabled").hide();
218
+
219
+ </script>
220
+ ]]>
221
+ </comment>
222
  </catalog_encryption_enabled>
223
  <encryption_public_key translate="label">
224
  <label>Catalog Encryption Public Key</label>
227
  <show_in_default>1</show_in_default>
228
  <show_in_website>1</show_in_website>
229
  <show_in_store>1</show_in_store>
230
+ <comment><![CDATA[
231
+ <script type='text/javascript'>
232
+ $("row_carriers_pbgsp_encryption_public_key").hide();
233
+
234
+ </script>
235
+ ]]>
236
+ </comment>
237
  </encryption_public_key>
238
  <notify_catalog_ok translate="label">
239
  <label>Notify on Successful Catalog Export</label>
448
  <show_in_website>1</show_in_website>
449
  <show_in_store>1</show_in_store>
450
  </custom_shipment_email_template>
451
+ <enablelogging translate="label">
452
+ <label>Enable Logging</label>
453
+ <frontend_type>select</frontend_type>
454
+ <source_model>adminhtml/system_config_source_yesno</source_model>
455
+ <sort_order>283</sort_order>
456
+ <show_in_default>1</show_in_default>
457
+ <show_in_website>1</show_in_website>
458
+ <show_in_store>1</show_in_store>
459
+ </enablelogging>
460
  <separate_log_file translate="label">
461
  <label>Log in separate file</label>
462
  <frontend_type>select</frontend_type>
463
+ <sort_order>284</sort_order>
464
  <frontend_class>shipping-skip-hide</frontend_class>
465
  <source_model>adminhtml/system_config_source_yesno</source_model>
466
  <show_in_default>1</show_in_default>
471
  <label>Return Address Street 1</label>
472
  <frontend_type>text</frontend_type>
473
 
474
+ <sort_order>285</sort_order>
475
  <show_in_default>1</show_in_default>
476
  <show_in_website>1</show_in_website>
477
  <show_in_store>1</show_in_store>
480
  <label>Return Address City</label>
481
  <frontend_type>text</frontend_type>
482
 
483
+ <sort_order>286</sort_order>
484
  <show_in_default>1</show_in_default>
485
  <show_in_website>1</show_in_website>
486
  <show_in_store>1</show_in_store>
489
  <label>Province/State</label>
490
  <frontend_type>text</frontend_type>
491
 
492
+ <sort_order>287</sort_order>
493
  <show_in_default>1</show_in_default>
494
  <show_in_website>1</show_in_website>
495
  <show_in_store>1</show_in_store>
498
  <label>Country</label>
499
  <frontend_type>select</frontend_type>
500
  <source_model>adminhtml/system_config_source_country</source_model>
501
+ <sort_order>288</sort_order>
502
  <show_in_default>1</show_in_default>
503
  <show_in_website>1</show_in_website>
504
  <show_in_store>1</show_in_store>
507
  <label>Zip or Postal Code</label>
508
  <frontend_type>text</frontend_type>
509
 
510
+ <sort_order>289</sort_order>
511
  <show_in_default>1</show_in_default>
512
  <show_in_website>1</show_in_website>
513
  <show_in_store>1</show_in_store>
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.3.0)
4
- * Packaged: 2015-11-12T06:33:00+00:00
5
- * Last Modified: 2015-11-04T12:13:20+00:00
6
 
7
 
8
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.2)
4
+ * Packaged: 2016-01-11T11:12:49+00:00
5
+ * Last Modified: 2015-12-18T11:00:00+00:00
6
 
7
 
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.3.0)
4
- * Packaged: 2015-11-12T06:33:00+00:00
5
- * Last Modified: 2015-11-04T12:13:20+00:00
6
 
7
 
8
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.2)
4
+ * Packaged: 2016-01-11T11:12:49+00:00
5
+ * Last Modified: 2015-12-18T11:00:00+00:00
6
 
7
 
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.3.0)
4
- * Packaged: 2015-11-12T06:33:00+00:00
5
- * Last Modified: 2015-11-04T12:13:20+00:00
6
 
7
 
8
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.2)
4
+ * Packaged: 2016-01-11T11:12:49+00:00
5
+ * Last Modified: 2015-12-18T11:00:00+00:00
6
 
7
 
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.3.0)
4
- * Packaged: 2015-11-12T06:33:00+00:00
5
- * Last Modified: 2015-11-04T12:13:20+00:00
6
 
7
 
8
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.2)
4
+ * Packaged: 2016-01-11T11:12:49+00:00
5
+ * Last Modified: 2015-12-18T11:00:00+00:00
6
 
7
 
8
 
app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.3.0-1.3.1.php ADDED
@@ -0,0 +1,176 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Product: Pb_Pbgsp (1.3.2)
4
+ * Packaged: 2016-01-11T11:12:49+00:00
5
+ * Last Modified: 2015-12-18T11:00:00+00:00
6
+
7
+
8
+
9
+
10
+
11
+ * File: app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php
12
+ * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
13
+ */
14
+
15
+
16
+ $installer = $this;
17
+
18
+ $installer->startSetup();
19
+ $versionInfo = Mage::getVersionInfo();
20
+ $version = floatval($versionInfo['major'].'.'.$versionInfo['minor']);
21
+ $eav = Mage::getResourceModel('catalog/setup', 'catalog_setup');
22
+ if(Mage::getEdition() == Mage::EDITION_ENTERPRISE && $version <= 1.12) {
23
+ $eav->removeAttribute('catalog_product','pb_pbgsp_upload');
24
+ $eav->addAttribute('catalog_product', 'pb_pbgsp_upload', array(
25
+ 'type' => 'int',
26
+ 'input' => 'text',
27
+ 'label' => 'Last PBGSP upload timestampt',
28
+ 'global' => 2,
29
+ 'user_defined' => 0,
30
+ 'required' => 0,
31
+ 'visible' => 1,
32
+ 'default' => 0
33
+
34
+ ));
35
+ $eav->removeAttribute('catalog_category','pb_pbgsp_upload');
36
+ $eav->addAttribute('catalog_category', 'pb_pbgsp_upload', array(
37
+ 'type' => 'int',
38
+ 'input' => 'text',
39
+ 'label' => 'Last PBGSP upload timestampt',
40
+ 'global' => 2,
41
+ 'user_defined' => 0,
42
+ 'required' => 0,
43
+ 'visible' => 1,
44
+ 'default' => 0,
45
+ 'group' => 'PBGSP'
46
+
47
+ ));
48
+
49
+
50
+ }
51
+ // reverse version 1.3.2
52
+ $eav->removeAttribute('catalog_product','pb_pbgsp_product_condition');
53
+ $eav->removeAttribute('catalog_product','pb_pbgsp_upload_active');
54
+ $eav->removeAttribute('catalog_product','pb_pbgsp_upload_delete');
55
+ $eav->removeAttribute('catalog_product','pb_pbgsp_upload_deleted_on');
56
+
57
+ $eav->addAttribute('catalog_product', 'pb_pbgsp_product_condition', array(
58
+ 'type' => 'varchar',
59
+ 'input' => 'select',
60
+ 'source' => 'pb_pbgsp/productattributesource_productconditions',
61
+ 'label' => 'Product Condition',
62
+ 'global' => 2,
63
+ 'user_defined' => 0,
64
+ 'required' => 0,
65
+ 'visible' => 1,
66
+ 'default' => 0
67
+
68
+ ));
69
+
70
+
71
+ // reverse version 1.3.3
72
+
73
+
74
+
75
+ $type = 'datetime';
76
+ $input = 'datetime';
77
+ if( (Mage::getEdition() == Mage::EDITION_ENTERPRISE && $version <= 1.12) ||
78
+ Mage::getEdition() == Mage::EDITION_COMMUNITY && $version <= 1.7) {
79
+ $type = 'int';
80
+ $input = 'text';
81
+ }
82
+ $eav->addAttribute('catalog_product', 'pb_pbgsp_upload_delete', array(
83
+ 'type' => 'int',
84
+ 'input' => 'select',
85
+ 'source' => 'eav/entity_attribute_source_boolean',
86
+ 'label' => 'Delete from PBGSP',
87
+ 'global' => 2,
88
+ 'user_defined' => 0,
89
+ 'required' => 0,
90
+ 'visible' => 1,
91
+ 'default' => 0
92
+
93
+ ));
94
+
95
+ $eav->addAttribute('catalog_product', 'pb_pbgsp_upload_deleted_on', array(
96
+ 'type' => $type,
97
+ 'input' => $input,
98
+ 'label' => 'Deleted from PBGSP on',
99
+ 'global' => 2,
100
+ 'user_defined' => 0,
101
+ 'required' => 0,
102
+ 'visible' => 1,
103
+ 'default' => 0
104
+
105
+ ));
106
+
107
+ // reverse version 1.3.4
108
+
109
+ $entityTypeId = Mage::getModel('catalog/product')->getResource()->getTypeId();
110
+ $sets = Mage::getModel('eav/entity_attribute_set')
111
+ ->getResourceCollection()
112
+ ->addFilter('entity_type_id', $entityTypeId);
113
+
114
+ //loop through all the attribute sets
115
+ foreach ($sets as $set)
116
+ {
117
+ $attributeSetId = $set->getId();
118
+ $group = Mage::getModel('eav/entity_attribute_group')
119
+ ->getResourceCollection()
120
+ ->setAttributeSetFilter($attributeSetId)
121
+ ->addFieldToFilter('attribute_group_name','PBGSP')
122
+ ->setSortOrder()
123
+ ->getFirstItem();
124
+
125
+ $groupId = $group->getId();
126
+ //if group doesn't present , create it.
127
+ if(empty($groupId)){
128
+ try{
129
+ $modelGroup = Mage::getModel('eav/entity_attribute_group');
130
+ $modelGroup->setAttributeGroupName('PBGSP')
131
+ ->setAttributeSetId($attributeSetId)
132
+ ->setSortOrder(100);
133
+ $modelGroup->save();
134
+
135
+ //$attributeGroupObject = new Varien_Object($installer->getAttributeGroup($entityTypeId ,$attributeSetId,'PBGSP'));
136
+
137
+ $groups = Mage::getModel('eav/entity_attribute_group')
138
+ ->getResourceCollection()
139
+ ->setAttributeSetFilter($attributeSetId)
140
+ ->addFieldToFilter('attribute_group_name','PBGSP')
141
+ ->setSortOrder()
142
+ ->getFirstItem();
143
+
144
+ $groupId = $groups->getAttributeGroupId();
145
+
146
+ }catch(Exception $e){
147
+ Mage::printException($e);
148
+ }
149
+
150
+ }
151
+
152
+ $codes = array('pb_pbgsp_upload_delete','pb_pbgsp_upload_deleted_on','pb_pbgsp_product_condition','pb_pbgsp_upload');
153
+
154
+ foreach ($codes as $code)
155
+ {
156
+ $attributeInfo = Mage::getResourceModel('eav/entity_attribute_collection')
157
+ ->setCodeFilter($code)
158
+ ->getFirstItem();
159
+ //$attCode = $attributeInfo->getAttributeCode();
160
+ $attId = $attributeInfo->getId();
161
+ if(!empty($attId) && !empty($groupId)){
162
+ $newItem = Mage::getModel('eav/entity_attribute');
163
+ $newItem->setEntityTypeId($entityTypeId)
164
+ ->setAttributeSetId($attributeSetId) // Attribute Set ID
165
+ ->setAttributeGroupId($groupId) // Group Id
166
+ ->setAttributeId($attId)
167
+ ->setSortOrder(10)
168
+ ->save();
169
+
170
+ }
171
+
172
+ }
173
+ }
174
+
175
+ $installer->endSetup();
176
+ ?>
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>pitneybowes_gsp</name>
4
- <version>1.3.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,22 +22,15 @@ 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>Patch release for Magento Connect.&#xD;
26
  &#xD;
27
- 1. Added admin interface for managing categories to be exported in the catalog. Store managers can now quickly enable and disable categories to be exported to PB.&#xD;
28
  &#xD;
29
- 2. Adjusted catalog export default preferences to 100k products&#xD;
30
- &#xD;
31
- 3. Catalog file naming change when multiple files are exported per catalog. (Changed file suffix to 00001, 00002, 00003, etc)&#xD;
32
- &#xD;
33
- 4. added a check if the ASN has already been generated for a shipment, do not create a new ASN if yes.&#xD;
34
- &#xD;
35
- 5. Fixed error when checkout with paypal express. The lastname was not set and the PB API throws an error when last name isn't set.&#xD;
36
- </notes>
37
- <authors><author><name>Raymond Lai</name><user>r3lai</user><email>raymond.lai@pb.com</email></author></authors>
38
- <date>2015-11-13</date>
39
- <time>17:23:54</time>
40
- <contents><target name="magelocal"><dir name="Pb"><dir name="Pbgsp"><dir name="Block"><dir name="Adminhtml"><dir name="Categorysettings"><file name="Grid.php" hash="1eacdc9d01f591611b905b3715c56dbf"/></dir><file name="Categorysettings.php" hash="d1f33a7ff42f76b5204f0ce88e75d141"/><dir name="Sales"><dir name="Order"><dir name="Invoice"><file name="Totals.php" hash="35028935564efcb41fde143f34c5f4fa"/></dir><file name="Totals.php" hash="3650928cbe8f7ae5985ea4f995ed6877"/></dir></dir></dir><dir name="Checkout"><dir name="Shipping"><dir name="Method"><file name="Available.php" hash="44da5ce61ea16b8f7c90cd793ec366ef"/></dir></dir></dir><file name="Form.php" hash="66e87202206b18fefb307c0662dd0e0f"/><dir name="Sales"><dir name="Order"><dir name="Invoice"><file name="Totals.php" hash="fddbcb10b6be166e39495edf89225503"/></dir><file name="Totals.php" hash="e1138f465c6ee46ba8b6946934fc5af8"/></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="913682a7e7293d17507e33edf3906da3"/></dir><dir name="Model"><file name="Api.php" hash="8db5a6093620e945fd454720e8101341"/><file name="Authapioptions.php" hash="8cd4e0e89c1bc6b5ca12d502386c89a2"/><dir name="Carrier"><file name="ShippingMethod.php" hash="f9194bcb06ac803ff0f4f73b63381376"/></dir><dir name="Catalog"><file name="Category.php" hash="72873da56493a1581afb18db0aabe175"/><file name="Cron.php" hash="eead66e6d638a965157615d1e9cb944c"/><file name="File.php" hash="c10a7da2118fc729ce5eefb70fdb3cbc"/><file name="Product.php" hash="b32f4a94831069aa35fd5cbec7657397"/></dir><file name="Credentials.php" hash="bf1b257effb1c6c8c419d651b07a11a5"/><dir name="Creditmemo"><file name="Duty.php" hash="9035170d3136c69063505777276843da"/></dir><file name="Environmentconfig.php" hash="d8e206a6005e931f7b53fe0ab7128187"/><file name="Handlingoptions.php" hash="dc647ab945ef5e5e7281bc3d8c014eb9"/><file name="Helper.php" hash="f0fc17e079b7ca628b4665b96381bea2"/><file name="Inboundparcel.php" hash="b646e0bd055acccd1654ec4aaa2cc5e0"/><dir name="Invoice"><file name="Duty.php" hash="8330490adec86a72154e62d8a89e8b38"/></dir><file name="Messages.php" hash="6184c5bc66e506d8d833892070515d7c"/><dir name="Mysql4"><dir name="Inboundparcel"><file name="Collection.php" hash="80416dcd68dbea7c37ec057e380c0d6d"/></dir><file name="Inboundparcel.php" hash="25dabbcc4280baac0f9036c497efa222"/><dir name="Ordernumber"><file name="Collection.php" hash="71499de4274089e9932a4dfdcc2004b1"/></dir><file name="Ordernumber.php" hash="aa8cf8b57ca218f76d36059664cda13a"/><dir name="Variable"><file name="Collection.php" hash="bc5e295a5765d5e77c48f22094c55bef"/></dir><file name="Variable.php" hash="1b9e5e00173cbd16a7af1e7a11d1106c"/></dir><file name="Observer.php" hash="31521c7d4a95f446108ac06db562a02d"/><file name="Ordernumber.php" hash="5a66651245964f8f9c36ae20dacfca74"/><dir name="Pdf"><file name="Tax.php" hash="05826b8bf0c234732be8254b2801b24f"/></dir><dir name="Quote"><file name="Duty.php" hash="c4901aabbb1c395f877f54855c3107e0"/></dir><dir name="Resource"><dir name="Mysql4"><file name="Setup.php" hash="d26cccd148880779d32100b6bdb85f8f"/></dir></dir><dir name="Sales"><dir name="Order"><file name="Shipment.php" hash="a4af461d97ed27d4ea328e082ae3a04e"/></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="323c74c4fdea0d8714f276045cb56a6c"/><file name="Variable.php" hash="837d156282809799cb8042eca10d290e"/></dir><file name="README" hash="e7ad1d9a7ba016753e381a9ca92b696e"/><dir name="controllers"><dir name="Adminhtml"><file name="CategorysettingsController.php" hash="fd34d8070cd433976eb411a65a2d2eb9"/></dir></dir><dir name="data"><dir name="pb_pbgsp_setup"><file name="data-install-1.0.0.php" hash="8e7c1f9abf23a72c855c61c4ce64f469"/></dir></dir><dir name="etc"><file name="config.xml" hash="8558418c5572baac87cc4712d452f8b6"/><file name="system.xml" hash="2be42cc9ffc0c6e191c6ad09c6fe28a0"/></dir><dir name="sql"><dir name="pbgsp_setup"><file name="mysql4-install-1.0.0.php" hash="3ebe640afbbb31b854417339f467a43e"/><file name="mysql4-upgrade-1.0.0-1.0.1.php" hash="24178c03c4c10563759f9c8405285c58"/><file name="mysql4-upgrade-1.1.1-1.1.2.php" hash="f73ccb764191b7970fc775ea101bd05a"/><file name="mysql4-upgrade-1.1.2-1.1.3.php" hash="1d3782eaf4b97b76610e0248bb938c3b"/><file name="mysql4-upgrade-1.2.0-1.2.1.php" hash="7a16f75912b3398f32d8d63d806907e2"/><file name="mysql4-upgrade-1.2.1-1.2.2.php" hash="4f7c435f922988778b5b264c622054b5"/><file name="mysql4-upgrade-1.2.1-1.2.4.php" hash="6dfe95296330dc6beb4110f415580526"/></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="e71092ee56e548d9ee28067f7d26893e"/><file name="PBGSP_Manual_Catalog_Export.php" hash="b63132f42e5448c015f744d8c739065b"/></dir></target></contents>
41
  <compatible/>
42
  <dependencies><required><php><min>5.1.0</min><max>5.6.0</max></php></required></dependencies>
43
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>pitneybowes_gsp</name>
4
+ <version>1.3.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>
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. Check for valid Magento order for ASN generation. Fixed an issue where if there was a problem at checkout, like credit card not working, an entry was created with the PB Order # but no Magento order #. The job that generates ASN will crash when it discovers these orphaned entries. If a valid magento order number isn&#x2019;t generated at the time of order, an ASN will not be generated for the order.&#xD;
26
  &#xD;
27
+ 2. Cleaned up the get group details functionality to remove warning notice in logs.&#xD;
28
  &#xD;
29
+ 3. Integrated PB in carrier list for tracking details. Customer no longer sees the "custom value" title but more accurately sees the "PB INTERNATIONAL SHIPPING" carrier.</notes>
30
+ <authors><author><name>Shane Bogdan</name><user>pbecommerce</user><email>shane.bogdan@pb.com</email></author></authors>
31
+ <date>2016-01-14</date>
32
+ <time>18:57:05</time>
33
+ <contents><target name="magelocal"><dir name="Pb"><dir name="Pbgsp"><dir name="Block"><dir name="Adminhtml"><dir name="Categorysettings"><file name="Grid.php" hash="40ee8e7da18c57b9e33b4afc5b72c521"/></dir><file name="Categorysettings.php" hash="f5853197a934165be004a5b74a4d6e21"/><dir name="Sales"><dir name="Order"><dir name="Invoice"><file name="Totals.php" hash="5f854c05b15d361105b311a4256bbbd5"/></dir><file name="Totals.php" hash="63e1df60b5e721979eebae501b8a9d6b"/></dir></dir></dir><dir name="Checkout"><dir name="Shipping"><dir name="Method"><file name="Available.php" hash="09ac83ec5824aff5d69f341c51ffe9e6"/></dir></dir></dir><file name="Form.php" hash="4fd9043e764f00378715d9509b1fb996"/><dir name="Sales"><dir name="Order"><dir name="Invoice"><file name="Totals.php" hash="3e6c23efde4c654cc186fe0e812293f3"/></dir><file name="Totals.php" hash="4b8a9a8887790a6975a146070e921dde"/></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="de25b57574195d605184bf7a07ed68fe"/></dir><dir name="Model"><file name="Api.php" hash="4dc6c6cc0c63140d8a4624bd28e47552"/><file name="Authapioptions.php" hash="8cd4e0e89c1bc6b5ca12d502386c89a2"/><dir name="Carrier"><file name="ShippingMethod.php" hash="bedc447a02ed80c0ac0a815ab6f2ba64"/></dir><dir name="Catalog"><file name="Category.php" hash="f2868d99cc52432da195b2d0d4b3793d"/><file name="Cron.php" hash="d865fd2b7c23e6c08392f2c28c72aef7"/><file name="File.php" hash="4752fd0ddd2532aa450c2e0ea08c3586"/><file name="Product.php" hash="08575c850733883abc2566d87c954544"/></dir><file name="Credentials.php" hash="505e466f6dcf4d578b704798bffe5edd"/><dir name="Creditmemo"><file name="Duty.php" hash="0b15a424b661a1fe93b72dd909694aa1"/></dir><file name="Environmentconfig.php" hash="fdc1af6fd2c098a0cacbf104393e5497"/><file name="Handlingoptions.php" hash="e359e4d8746d835ec7945e522dcbbee9"/><file name="Helper.php" hash="f508afa7d5b5daf6eb9ccc872374d6e7"/><file name="Inboundparcel.php" hash="fe88eb0db1fb54066400adb6aaec791d"/><dir name="Invoice"><file name="Duty.php" hash="5c71233abfde9419675188cdb429853e"/></dir><file name="Messages.php" hash="be91063169d0fef19ca4fbc20fd61b42"/><dir name="Mysql4"><dir name="Inboundparcel"><file name="Collection.php" hash="523cd2489551265f2dd2f889101c27a5"/></dir><file name="Inboundparcel.php" hash="e36b0d40041127e4e80bdd201e59741b"/><dir name="Ordernumber"><file name="Collection.php" hash="405606c2b28818c7b5bf23393bf7779a"/></dir><file name="Ordernumber.php" hash="6f07374bfcbc40743d3dac5747e30c2c"/><dir name="Variable"><file name="Collection.php" hash="e19115324583201857eeeba1d7d76b3d"/></dir><file name="Variable.php" hash="1207a719a710475ca79d01785c3ba158"/></dir><file name="Observer.php" hash="b372cf19e1f5be836c3ced429c85c141"/><file name="Ordernumber.php" hash="20ae4139a6e63de103f8b157bd455107"/><dir name="Pdf"><file name="Tax.php" hash="80ca0d4b15101f9d5bb612383585a0e5"/></dir><dir name="Productattributesource"><file name="Productconditions.php" hash="23495b314815a4a5dc3c220661aa2604"/></dir><dir name="Quote"><file name="Duty.php" hash="5cbe7f827568d10ff7737dbc5e6dc358"/></dir><dir name="Resource"><dir name="Mysql4"><file name="Setup.php" hash="4997a8371f1defa2b5bf2aaa3ef76afd"/></dir></dir><dir name="Sales"><dir name="Order"><file name="Shipment.php" hash="bfc999a2e3a6f3f3003be34ecfe3a66a"/></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="980967e983645d987cb1c1ad90a905c1"/><file name="Variable.php" hash="c1c12dc063dbba692e6ccc2de527aef4"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="CategorysettingsController.php" hash="16c04dd845110960a54d24487856952d"/></dir></dir><dir name="data"><dir name="pb_pbgsp_setup"><file name="data-install-1.0.0.php" hash="e2b4d5c373058bc45bf7983f8f491fd5"/></dir></dir><dir name="etc"><file name="config.xml" hash="e1974b9a71ac9796054cc4321166095f"/><file name="config.xml_bk" hash="c5badd43bf052dacfe869455c724d7da"/><file name="system.xml" hash="b0fbe24adc5481836223ae8f0817f94a"/></dir><dir name="sql"><dir name="pbgsp_setup"><file name="mysql4-install-1.0.0.php" hash="6c8a4f5a1b82df19ee22276a5d140dc9"/><file name="mysql4-upgrade-1.0.0-1.0.1.php" hash="a869fc1c6538c16b346d16d70a666bf3"/><file name="mysql4-upgrade-1.1.1-1.1.2.php" hash="c3b4708bd62b75fd777b936f6260be83"/><file name="mysql4-upgrade-1.1.2-1.1.3.php" hash="1d3782eaf4b97b76610e0248bb938c3b"/><file name="mysql4-upgrade-1.2.0-1.2.1.php" hash="ec11da391ee7a1d3898bb246843aad47"/><file name="mysql4-upgrade-1.2.1-1.2.2.php" hash="4f7c435f922988778b5b264c622054b5"/><file name="mysql4-upgrade-1.2.1-1.2.4.php" hash="6dfe95296330dc6beb4110f415580526"/><file name="mysql4-upgrade-1.3.0-1.3.1.php" hash="58781ae5c9ee90713a333b340815d695"/></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="b52f37efd81b8a7a0ffe57ff56313f87"/><file name="PBGSP_Manual_Catalog_Export.php" hash="4be83b279be7e89c3f3cb6bfa5d0a140"/></dir></target></contents>
 
 
 
 
 
 
 
34
  <compatible/>
35
  <dependencies><required><php><min>5.1.0</min><max>5.6.0</max></php></required></dependencies>
36
  </package>