pitneybowes_gsp - Version 1.3.0

Version Notes

Patch release for Magento Connect.

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.

2. Adjusted catalog export default preferences to 100k products

3. Catalog file naming change when multiple files are exported per catalog. (Changed file suffix to 00001, 00002, 00003, etc)

4. added a check if the ASN has already been generated for a shipment, do not create a new ASN if yes.

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.

Download this release

Release Info

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


Code changes from version 1.2.3 to 1.3.0

Files changed (47) hide show
  1. ReadMe.txt +14 -0
  2. app/code/local/Pb/Pbgsp/Block/Adminhtml/Categorysettings/Grid.php +1 -1
  3. app/code/local/Pb/Pbgsp/Block/Adminhtml/Sales/Order/Invoice/Totals.php +3 -3
  4. app/code/local/Pb/Pbgsp/Block/Adminhtml/Sales/Order/Totals.php +3 -3
  5. app/code/local/Pb/Pbgsp/Block/Checkout/Shipping/Method/Available.php +3 -3
  6. app/code/local/Pb/Pbgsp/Block/Form.php +3 -3
  7. app/code/local/Pb/Pbgsp/Block/Sales/Order/Invoice/Totals.php +3 -3
  8. app/code/local/Pb/Pbgsp/Block/Sales/Order/Totals.php +3 -3
  9. app/code/local/Pb/Pbgsp/Model/Api.php +7 -4
  10. app/code/local/Pb/Pbgsp/Model/Carrier/ShippingMethod.php +22 -19
  11. app/code/local/Pb/Pbgsp/Model/Catalog/Category.php +3 -3
  12. app/code/local/Pb/Pbgsp/Model/Catalog/Cron.php +3 -3
  13. app/code/local/Pb/Pbgsp/Model/Catalog/File.php +6 -6
  14. app/code/local/Pb/Pbgsp/Model/Catalog/Product.php +3 -3
  15. app/code/local/Pb/Pbgsp/Model/Credentials.php +3 -3
  16. app/code/local/Pb/Pbgsp/Model/Creditmemo/Duty.php +3 -3
  17. app/code/local/Pb/Pbgsp/Model/Environmentconfig.php +3 -3
  18. app/code/local/Pb/Pbgsp/Model/Handlingoptions.php +3 -3
  19. app/code/local/Pb/Pbgsp/Model/Helper.php +3 -3
  20. app/code/local/Pb/Pbgsp/Model/Inboundparcel.php +3 -3
  21. app/code/local/Pb/Pbgsp/Model/Invoice/Duty.php +3 -3
  22. app/code/local/Pb/Pbgsp/Model/Messages.php +3 -3
  23. app/code/local/Pb/Pbgsp/Model/Mysql4/Inboundparcel.php +3 -3
  24. app/code/local/Pb/Pbgsp/Model/Mysql4/Inboundparcel/Collection.php +3 -3
  25. app/code/local/Pb/Pbgsp/Model/Mysql4/Ordernumber.php +3 -3
  26. app/code/local/Pb/Pbgsp/Model/Mysql4/Ordernumber/Collection.php +3 -3
  27. app/code/local/Pb/Pbgsp/Model/Mysql4/Variable.php +3 -3
  28. app/code/local/Pb/Pbgsp/Model/Mysql4/Variable/Collection.php +3 -3
  29. app/code/local/Pb/Pbgsp/Model/Observer.php +26 -7
  30. app/code/local/Pb/Pbgsp/Model/Ordernumber.php +3 -3
  31. app/code/local/Pb/Pbgsp/Model/Pdf/Tax.php +3 -3
  32. app/code/local/Pb/Pbgsp/Model/Quote/Duty.php +4 -4
  33. app/code/local/Pb/Pbgsp/Model/Resource/Mysql4/Setup.php +3 -3
  34. app/code/local/Pb/Pbgsp/Model/Sales/Order/Shipment.php +3 -3
  35. app/code/local/Pb/Pbgsp/Model/Util.php +3 -3
  36. app/code/local/Pb/Pbgsp/Model/Variable.php +3 -3
  37. app/code/local/Pb/Pbgsp/README +2 -0
  38. app/code/local/Pb/Pbgsp/data/pb_pbgsp_setup/data-install-1.0.0.php +3 -3
  39. app/code/local/Pb/Pbgsp/etc/config.xml +51 -10
  40. app/code/local/Pb/Pbgsp/etc/system.xml_bk +0 -453
  41. app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php +3 -3
  42. app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.0.0-1.0.1.php +3 -3
  43. app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.1.1-1.1.2.php +3 -3
  44. app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.2.0-1.2.1.php +3 -3
  45. app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.2.1-1.2.2.php +55 -0
  46. app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.2.1-1.2.4.php +55 -0
  47. package.xml +12 -6
ReadMe.txt CHANGED
@@ -31,6 +31,20 @@ In order to take advantage of the file encryption setting in the extension confi
31
  ========================================================
32
  CHANGELOG
33
  ========================================================
 
 
 
 
 
 
 
 
 
 
 
 
 
 
34
  v. 1.2.3
35
 
36
  Fixed an issue with 3rd party checkout extensions where shipping wouldn’t show correctly when switching back and forth between US and International locations
31
  ========================================================
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.
38
+
39
+ Adjusted catalog export default preferences to 100k products
40
+
41
+ Catalog file naming change when multiple files are exported per catalog. (Changed file suffix to 00001, 00002, 00003, etc)
42
+
43
+ added a check if the ASN has already been generated for a shipment, do not create a new ASN if yes.
44
+
45
+ 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.
46
+
47
+
48
  v. 1.2.3
49
 
50
  Fixed an issue with 3rd party checkout extensions where shipping wouldn’t show correctly when switching back and forth between US and International locations
app/code/local/Pb/Pbgsp/Block/Adminhtml/Categorysettings/Grid.php CHANGED
@@ -13,7 +13,7 @@ class Pb_Pbgsp_Block_Adminhtml_Categorysettings_Grid extends Mage_Adminhtml_Bloc
13
  $this->setId('categorysettingsGrid');
14
  $this->setDefaultSort('entity_id');
15
  $this->setDefaultDir('ASC');
16
- $this->setUseAjax(true);
17
  $this->setSaveParametersInSession(true);
18
  }
19
 
13
  $this->setId('categorysettingsGrid');
14
  $this->setDefaultSort('entity_id');
15
  $this->setDefaultDir('ASC');
16
+ //$this->setUseAjax(true);
17
  $this->setSaveParametersInSession(true);
18
  }
19
 
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.2.3)
5
- * Packaged: 2015-11-04T12:13:20+00:00
6
- * Last Modified: 2015-10-21T12:09:20+00:00
7
 
8
 
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
 
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.2.3)
5
- * Packaged: 2015-11-04T12:13:20+00:00
6
- * Last Modified: 2015-10-21T12:09:20+00:00
7
 
8
 
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
 
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.2.3)
5
- * Packaged: 2015-11-04T12:13:20+00:00
6
- * Last Modified: 2015-10-21T12:09:20+00:00
7
 
8
 
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
 
app/code/local/Pb/Pbgsp/Block/Form.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.2.3)
4
- * Packaged: 2015-11-04T12:13:20+00:00
5
- * Last Modified: 2015-10-21T12:09:20+00:00
6
 
7
 
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
 
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.2.3)
5
- * Packaged: 2015-11-04T12:13:20+00:00
6
- * Last Modified: 2015-10-21T12:09:20+00:00
7
 
8
 
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
 
app/code/local/Pb/Pbgsp/Block/Sales/Order/Totals.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.2.3)
4
- * Packaged: 2015-11-04T12:13:20+00:00
5
- * Last Modified: 2015-10-21T12:09:20+00:00
6
 
7
 
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
 
app/code/local/Pb/Pbgsp/Model/Api.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.2.3)
4
- * Packaged: 2015-11-04T12:13:20+00:00
5
- * Last Modified: 2015-10-21T12:09:20+00:00
6
 
7
 
8
 
@@ -215,8 +215,11 @@ class Pb_Pbgsp_Model_Api
215
  if(!$email)
216
  $email = "kamranattari@gmail.com";
217
 
 
 
 
218
  $consignee = array(
219
- 'familyName' => $address->getLastname(),
220
  'givenName' => $address->getFirstname(),
221
  'email' => $email,
222
  'phoneNumbers' => array(
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
 
215
  if(!$email)
216
  $email = "kamranattari@gmail.com";
217
 
218
+ $familyName = $address->getLastname(); //when it comes from paypal express, lastname is null, Kamran, Bigpixel Studio,
219
+ if(!$familyName)
220
+ $familyName = $address->getFirstname();
221
  $consignee = array(
222
+ 'familyName' => $familyName,
223
  'givenName' => $address->getFirstname(),
224
  'email' => $email,
225
  'phoneNumbers' => array(
app/code/local/Pb/Pbgsp/Model/Carrier/ShippingMethod.php CHANGED
@@ -1,9 +1,9 @@
1
  <?php
2
 
3
  /**
4
- * Product: Pb_Pbgsp (1.2.3)
5
- * Packaged: 2015-11-04T12:13:20+00:00
6
- * Last Modified: 2015-10-21T12:09:20+00:00
7
 
8
 
9
 
@@ -36,23 +36,26 @@ class Pb_Pbgsp_Model_Carrier_ShippingMethod extends Mage_Shipping_Model_Carrier_
36
  $processor = new Pb_Pbgsp_Model_Messages();
37
  $isUnitErrorAdded = false;
38
 
39
- foreach($quote['quoteLines'] as $quoteLine) {
40
- if(array_key_exists('unitErrors',$quoteLine)) {
41
- foreach($quoteLine['unitErrors'] as $error) {
42
- $message = '';
43
- if(array_key_exists('message',$error))
44
- $message = $error['message'];
45
- $message = $processor->getDisplayMessage($error["error"],$message);//.$sku;
46
- $sku = $quoteLine['merchantComRefId'];
47
- $product = Mage::getModel('catalog/product')->loadByAttribute('sku',$sku);
48
- $message = $message . " Please remove ". $product->getName() . " from cart.";
49
- $this->_addError($result,$message);
50
- $isUnitErrorAdded = true;
 
 
 
51
  }
52
 
53
  }
54
-
55
  }
 
56
  if(!$isUnitErrorAdded) {
57
  foreach($quote['errors'] as $error) {
58
  $message = '';
@@ -155,7 +158,7 @@ class Pb_Pbgsp_Model_Carrier_ShippingMethod extends Mage_Shipping_Model_Carrier_
155
  Mage::getSingleton("customer/session")->setPbDutyAndTax($tax);
156
  $method->setTax($tax);
157
  }
158
-
159
  return $method;
160
  }
161
  private function _getCheapestShipMethod($quoteSet,$items)
@@ -186,7 +189,7 @@ class Pb_Pbgsp_Model_Carrier_ShippingMethod extends Mage_Shipping_Model_Carrier_
186
  public function collectRates(Mage_Shipping_Model_Rate_Request $request)
187
  {
188
  Mage::getSingleton("customer/session")->setPbDutyAndTax(false);
189
- Mage::getSingleton("customer/session")->setPbOrderNumber(false);
190
  Mage::getSingleton("customer/session")->setPbDutyAndTaxUSD(false);
191
  //Pb_Pbgsp_Model_Util::log('Pb_Pbgsp_Model_Carrier_ShippingMethod.collectRates ' . Mage::getStoreConfig('carriers/'.$this->_code.'/active'));
192
  // skip if not enabled
@@ -299,7 +302,7 @@ class Pb_Pbgsp_Model_Carrier_ShippingMethod extends Mage_Shipping_Model_Carrier_
299
  $message = "We've received an unexpected error while getting your quote. Please try again. If the error persists contact magentosupport@pb.com.";
300
  $this->_addError($result,$message);
301
  Mage::getSingleton("customer/session")->setPbDutyAndTax(false);
302
- Mage::getSingleton("customer/session")->setPbOrderNumber(false);
303
  Mage::getSingleton("customer/session")->setPbDutyAndTaxUSD(false);
304
 
305
  }
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
 
36
  $processor = new Pb_Pbgsp_Model_Messages();
37
  $isUnitErrorAdded = false;
38
 
39
+ if(array_key_exists('quoteLines',$quote)) {
40
+ foreach($quote['quoteLines'] as $quoteLine) {
41
+ if(array_key_exists('unitErrors',$quoteLine)) {
42
+ foreach($quoteLine['unitErrors'] as $error) {
43
+ $message = '';
44
+ if(array_key_exists('message',$error))
45
+ $message = $error['message'];
46
+ $message = $processor->getDisplayMessage($error["error"],$message);//.$sku;
47
+ $sku = $quoteLine['merchantComRefId'];
48
+ $product = Mage::getModel('catalog/product')->loadByAttribute('sku',$sku);
49
+ $message = $message . " Please remove ". $product->getName() . " from cart.";
50
+ $this->_addError($result,$message);
51
+ $isUnitErrorAdded = true;
52
+ }
53
+
54
  }
55
 
56
  }
 
57
  }
58
+
59
  if(!$isUnitErrorAdded) {
60
  foreach($quote['errors'] as $error) {
61
  $message = '';
158
  Mage::getSingleton("customer/session")->setPbDutyAndTax($tax);
159
  $method->setTax($tax);
160
  }
161
+ Pb_Pbgsp_Model_Util::log($method);
162
  return $method;
163
  }
164
  private function _getCheapestShipMethod($quoteSet,$items)
189
  public function collectRates(Mage_Shipping_Model_Rate_Request $request)
190
  {
191
  Mage::getSingleton("customer/session")->setPbDutyAndTax(false);
192
+
193
  Mage::getSingleton("customer/session")->setPbDutyAndTaxUSD(false);
194
  //Pb_Pbgsp_Model_Util::log('Pb_Pbgsp_Model_Carrier_ShippingMethod.collectRates ' . Mage::getStoreConfig('carriers/'.$this->_code.'/active'));
195
  // skip if not enabled
302
  $message = "We've received an unexpected error while getting your quote. Please try again. If the error persists contact magentosupport@pb.com.";
303
  $this->_addError($result,$message);
304
  Mage::getSingleton("customer/session")->setPbDutyAndTax(false);
305
+
306
  Mage::getSingleton("customer/session")->setPbDutyAndTaxUSD(false);
307
 
308
  }
app/code/local/Pb/Pbgsp/Model/Catalog/Category.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.2.3)
4
- * Packaged: 2015-11-04T12:13:20+00:00
5
- * Last Modified: 2015-10-21T12:09:20+00:00
6
 
7
 
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
 
app/code/local/Pb/Pbgsp/Model/Catalog/Cron.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.2.3)
4
- * Packaged: 2015-11-04T12:13:20+00:00
5
- * Last Modified: 2015-10-21T12:09:20+00:00
6
 
7
 
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
 
app/code/local/Pb/Pbgsp/Model/Catalog/File.php CHANGED
@@ -1,9 +1,9 @@
1
  <?php
2
 
3
  /**
4
- * Product: Pb_Pbgsp (1.2.3)
5
- * Packaged: 2015-11-04T12:13:20+00:00
6
- * Last Modified: 2015-10-21T12:09:20+00:00
7
 
8
 
9
 
@@ -40,7 +40,7 @@ class Pb_Pbgsp_Model_Catalog_File {
40
  private function _getDataFileName($dataFeedName,$part=null) {
41
  $partName = '';
42
  if($part)
43
- $partName = '_part'.$part;
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;
@@ -269,7 +269,7 @@ class Pb_Pbgsp_Model_Catalog_File {
269
  $pbProduct = new Pb_Pbgsp_Model_Catalog_Product($product,sprintf($productUrlFormat,$product->getId()));
270
  if( $fileRecordCount > $maxRecordsCount)
271
  {
272
- $this->_createNewCommoditiyFile();
273
  $fileRecordCount=0;
274
  $part++;
275
  }
@@ -792,7 +792,7 @@ class Pb_Pbgsp_Model_Catalog_File {
792
  {
793
  if ($part == 2) {
794
  //there is only one part remove part1 from filename
795
- rename($this->filename, str_replace('_part1', '', $this->filename));
796
  }
797
  }
798
  }
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
 
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;
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
  }
792
  {
793
  if ($part == 2) {
794
  //there is only one part remove part1 from filename
795
+ rename($this->filename, str_replace('_00001', '', $this->filename));
796
  }
797
  }
798
  }
app/code/local/Pb/Pbgsp/Model/Catalog/Product.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.2.3)
4
- * Packaged: 2015-11-04T12:13:20+00:00
5
- * Last Modified: 2015-10-21T12:09:20+00:00
6
 
7
 
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
 
app/code/local/Pb/Pbgsp/Model/Credentials.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.2.3)
4
- * Packaged: 2015-11-04T12:13:20+00:00
5
- * Last Modified: 2015-10-21T12:09:20+00:00
6
 
7
 
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
 
app/code/local/Pb/Pbgsp/Model/Creditmemo/Duty.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.2.3)
4
- * Packaged: 2015-11-04T12:13:20+00:00
5
- * Last Modified: 2015-10-21T12:09:20+00:00
6
 
7
 
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
 
app/code/local/Pb/Pbgsp/Model/Environmentconfig.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.2.3)
4
- * Packaged: 2015-11-04T12:13:20+00:00
5
- * Last Modified: 2015-10-21T12:09:20+00:00
6
 
7
 
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
 
app/code/local/Pb/Pbgsp/Model/Handlingoptions.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.2.3)
4
- * Packaged: 2015-11-04T12:13:20+00:00
5
- * Last Modified: 2015-10-21T12:09:20+00:00
6
 
7
 
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
 
app/code/local/Pb/Pbgsp/Model/Helper.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.2.3)
4
- * Packaged: 2015-11-04T12:13:20+00:00
5
- * Last Modified: 2015-10-21T12:09:20+00:00
6
 
7
 
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
 
app/code/local/Pb/Pbgsp/Model/Inboundparcel.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.2.3)
4
- * Packaged: 2015-11-04T12:13:20+00:00
5
- * Last Modified: 2015-10-21T12:09:20+00:00
6
 
7
 
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
 
app/code/local/Pb/Pbgsp/Model/Invoice/Duty.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.2.3)
4
- * Packaged: 2015-11-04T12:13:20+00:00
5
- * Last Modified: 2015-10-21T12:09:20+00:00
6
 
7
 
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
 
app/code/local/Pb/Pbgsp/Model/Messages.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.2.3)
4
- * Packaged: 2015-11-04T12:13:20+00:00
5
- * Last Modified: 2015-10-21T12:09:20+00:00
6
 
7
 
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
 
app/code/local/Pb/Pbgsp/Model/Mysql4/Inboundparcel.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.2.3)
4
- * Packaged: 2015-11-04T12:13:20+00:00
5
- * Last Modified: 2015-10-21T12:09:20+00:00
6
 
7
 
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
 
app/code/local/Pb/Pbgsp/Model/Mysql4/Inboundparcel/Collection.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.2.3)
4
- * Packaged: 2015-11-04T12:13:20+00:00
5
- * Last Modified: 2015-10-21T12:09:20+00:00
6
 
7
 
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
 
app/code/local/Pb/Pbgsp/Model/Mysql4/Ordernumber.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.2.3)
4
- * Packaged: 2015-11-04T12:13:20+00:00
5
- * Last Modified: 2015-10-21T12:09:20+00:00
6
 
7
 
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
 
app/code/local/Pb/Pbgsp/Model/Mysql4/Ordernumber/Collection.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.2.3)
4
- * Packaged: 2015-11-04T12:13:20+00:00
5
- * Last Modified: 2015-10-21T12:09:20+00:00
6
 
7
 
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
 
app/code/local/Pb/Pbgsp/Model/Mysql4/Variable.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.2.3)
4
- * Packaged: 2015-11-04T12:13:20+00:00
5
- * Last Modified: 2015-10-21T12:09:20+00:00
6
 
7
 
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
 
app/code/local/Pb/Pbgsp/Model/Mysql4/Variable/Collection.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.2.3)
4
- * Packaged: 2015-11-04T12:13:20+00:00
5
- * Last Modified: 2015-10-21T12:09:20+00:00
6
 
7
 
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
 
app/code/local/Pb/Pbgsp/Model/Observer.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.2.3)
4
- * Packaged: 2015-11-04T12:13:20+00:00
5
- * Last Modified: 2015-10-21T12:09:20+00:00
6
 
7
 
8
 
@@ -16,11 +16,12 @@ class Pb_Pbgsp_Model_Observer {
16
 
17
  public function isPbOrder($address) {
18
  $shipMethod = $address->getShippingMethod();
 
19
  $len = strlen("pbgsp_");
20
  if (strlen($shipMethod) > $len && substr($shipMethod,0,$len) == "pbgsp_") {
21
  return true;
22
  }
23
- Pb_Pbgsp_Model_Util::log("Shipping method". $shipMethod);
24
  return false;
25
 
26
  }
@@ -57,8 +58,10 @@ class Pb_Pbgsp_Model_Observer {
57
  //check if ASN already generated or not
58
  $parcel = Mage::getModel("pb_pbgsp/inboundparcel")-> getCollection();
59
  $parcel -> addFieldToFilter('mage_order_number', $order -> getRealOrderId());
60
- // if(count($parcel) > 0)
61
- // return;
 
 
62
  Pb_Pbgsp_Model_Util::log("Generting ASN.");
63
  $clearPathOrders = Mage::getModel("pb_pbgsp/ordernumber")-> getCollection();
64
  $clearPathOrders -> addFieldToFilter('mage_order_number', $order -> getRealOrderId());
@@ -121,7 +124,20 @@ class Pb_Pbgsp_Model_Observer {
121
  $order = Mage::getModel('sales/order')->loadByIncrementId($mageOrderNumber);
122
  Pb_Pbgsp_Model_Util::log(" createPbOrder");
123
  if ($this->isPbOrder($order)) {
 
 
 
 
 
 
 
 
 
 
 
 
124
  $orderNumber = Mage::getSingleton("customer/session")->getPbOrderNumber();
 
125
 
126
  // Save in DB
127
 
@@ -204,9 +220,11 @@ class Pb_Pbgsp_Model_Observer {
204
  }
205
 
206
  public function saveShippingMethod($observer) {
207
- //Pb_Pbgsp_Model_Util::log('Pb_Pbgsp_Model_Observer.saveShippingMethod');
208
  //TODO: If anything fails here I need to fail the checkout process.
209
  $address = $observer->getQuote()->getShippingAddress();
 
 
210
  $domesticShippingAdress = $address->getName()."</br>".$address->getStreetFull().", ".$address->getCity()."</br> ".$address->getRegion().", ".$address->getCountry().",".$address->getPostcode()."</br> T:".$address->getTelephone();
211
  if ($this->isPbOrder($address)) {
212
  Pb_Pbgsp_Model_Util::log(" PB order");
@@ -241,6 +259,7 @@ class Pb_Pbgsp_Model_Observer {
241
  $orderNumber->setHubPostalCode($order["shipToHub"]['hubAddress']['postalOrZipCode']);
242
  $orderNumber->setHubCity($order["shipToHub"]['hubAddress']['city']);
243
  $orderNumber->setOriginalShippingAddress($domesticShippingAdress);
 
244
  Mage::getSingleton("customer/session")->setPbOrderNumber($orderNumber);
245
  } else {
246
  Pb_Pbgsp_Model_Util::log(" not clearpath order");
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
 
16
 
17
  public function isPbOrder($address) {
18
  $shipMethod = $address->getShippingMethod();
19
+ Pb_Pbgsp_Model_Util::log("Shipping method". $shipMethod);
20
  $len = strlen("pbgsp_");
21
  if (strlen($shipMethod) > $len && substr($shipMethod,0,$len) == "pbgsp_") {
22
  return true;
23
  }
24
+
25
  return false;
26
 
27
  }
58
  //check if ASN already generated or not
59
  $parcel = Mage::getModel("pb_pbgsp/inboundparcel")-> getCollection();
60
  $parcel -> addFieldToFilter('mage_order_number', $order -> getRealOrderId());
61
+ $parcel->addFieldToFilter('mage_order_shipment_number',$shipId);
62
+
63
+ if(count($parcel) > 0)
64
+ return;
65
  Pb_Pbgsp_Model_Util::log("Generting ASN.");
66
  $clearPathOrders = Mage::getModel("pb_pbgsp/ordernumber")-> getCollection();
67
  $clearPathOrders -> addFieldToFilter('mage_order_number', $order -> getRealOrderId());
124
  $order = Mage::getModel('sales/order')->loadByIncrementId($mageOrderNumber);
125
  Pb_Pbgsp_Model_Util::log(" createPbOrder");
126
  if ($this->isPbOrder($order)) {
127
+ // $clearPathOrders = Mage::getModel("pb_pbgsp/ordernumber")-> getCollection();
128
+ // $clearPathOrders -> addFieldToFilter('mage_order_number', $order -> getRealOrderId());
129
+ // $orderNumber = null;
130
+ // foreach ($clearPathOrders as $cpOrder) {
131
+ // $orderNumber = $cpOrder;
132
+ //
133
+ // }
134
+ // if(!$orderNumber) {
135
+ // Pb_Pbgsp_Model_Util::log("$mageOrderNumber not PB order");
136
+ // return;
137
+ // }
138
+
139
  $orderNumber = Mage::getSingleton("customer/session")->getPbOrderNumber();
140
+ //$orderNumber = Mage::getSingleton("customer/session")->getPbOrderNumber();
141
 
142
  // Save in DB
143
 
220
  }
221
 
222
  public function saveShippingMethod($observer) {
223
+ Pb_Pbgsp_Model_Util::log('Pb_Pbgsp_Model_Observer.saveShippingMethod');
224
  //TODO: If anything fails here I need to fail the checkout process.
225
  $address = $observer->getQuote()->getShippingAddress();
226
+ Pb_Pbgsp_Model_Util::log($address->getShippingMethod());
227
+ Pb_Pbgsp_Model_Util::log($this->getShipMethod($observer));
228
  $domesticShippingAdress = $address->getName()."</br>".$address->getStreetFull().", ".$address->getCity()."</br> ".$address->getRegion().", ".$address->getCountry().",".$address->getPostcode()."</br> T:".$address->getTelephone();
229
  if ($this->isPbOrder($address)) {
230
  Pb_Pbgsp_Model_Util::log(" PB order");
259
  $orderNumber->setHubPostalCode($order["shipToHub"]['hubAddress']['postalOrZipCode']);
260
  $orderNumber->setHubCity($order["shipToHub"]['hubAddress']['city']);
261
  $orderNumber->setOriginalShippingAddress($domesticShippingAdress);
262
+ $orderNumber->save();
263
  Mage::getSingleton("customer/session")->setPbOrderNumber($orderNumber);
264
  } else {
265
  Pb_Pbgsp_Model_Util::log(" not clearpath order");
app/code/local/Pb/Pbgsp/Model/Ordernumber.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.2.3)
4
- * Packaged: 2015-11-04T12:13:20+00:00
5
- * Last Modified: 2015-10-21T12:09:20+00:00
6
 
7
 
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
 
app/code/local/Pb/Pbgsp/Model/Pdf/Tax.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.2.3)
4
- * Packaged: 2015-11-04T12:13:20+00:00
5
- * Last Modified: 2015-10-21T12:09:20+00:00
6
 
7
 
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
 
app/code/local/Pb/Pbgsp/Model/Quote/Duty.php CHANGED
@@ -1,9 +1,9 @@
1
  <?php
2
 
3
  /**
4
- * Product: Pb_Pbgsp (1.2.3)
5
- * Packaged: 2015-11-04T12:13:20+00:00
6
- * Last Modified: 2015-10-21T12:09:20+00:00
7
 
8
 
9
 
@@ -57,7 +57,7 @@ class Pb_Pbgsp_Model_Quote_Duty extends Mage_Tax_Model_Sales_Total_Quote_Tax
57
  if(!(strpos($activeCountries,$address->getCountryId()) !== false)) {
58
  //Pb_Pbgsp_Model_Util::log($address->getCountryId().' not found');
59
  Mage::getSingleton("customer/session")->setPbDutyAndTax(false);
60
- Mage::getSingleton("customer/session")->setPbOrderNumber(false);
61
  Mage::getSingleton("customer/session")->setPbDutyAndTaxUSD(false);
62
  return $this;
63
  }
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
 
57
  if(!(strpos($activeCountries,$address->getCountryId()) !== false)) {
58
  //Pb_Pbgsp_Model_Util::log($address->getCountryId().' not found');
59
  Mage::getSingleton("customer/session")->setPbDutyAndTax(false);
60
+
61
  Mage::getSingleton("customer/session")->setPbDutyAndTaxUSD(false);
62
  return $this;
63
  }
app/code/local/Pb/Pbgsp/Model/Resource/Mysql4/Setup.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.2.3)
4
- * Packaged: 2015-11-04T12:13:20+00:00
5
- * Last Modified: 2015-10-21T12:09:20+00:00
6
 
7
 
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
 
app/code/local/Pb/Pbgsp/Model/Sales/Order/Shipment.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.2.3)
4
- * Packaged: 2015-11-04T12:13:20+00:00
5
- * Last Modified: 2015-10-21T12:09:20+00:00
6
 
7
 
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
 
app/code/local/Pb/Pbgsp/Model/Util.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.2.3)
4
- * Packaged: 2015-11-04T12:13:20+00:00
5
- * Last Modified: 2015-10-21T12:09:20+00:00
6
 
7
 
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
 
app/code/local/Pb/Pbgsp/Model/Variable.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.2.3)
4
- * Packaged: 2015-11-04T12:13:20+00:00
5
- * Last Modified: 2015-10-21T12:09:20+00:00
6
 
7
 
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
 
app/code/local/Pb/Pbgsp/README ADDED
@@ -0,0 +1,2 @@
 
 
1
+ Dependencies:
2
+ gnupg
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.2.3)
4
- * Packaged: 2015-11-04T12:13:20+00:00
5
- * Last Modified: 2015-10-21T12:09:20+00:00
6
 
7
 
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
 
app/code/local/Pb/Pbgsp/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <Pb_Pbgsp>
5
- <version>1.2.3</version>
6
  </Pb_Pbgsp>
7
  </modules>
8
  <global>
@@ -188,6 +188,12 @@
188
  </totals>
189
  </pdf>
190
 
 
 
 
 
 
 
191
  </global>
192
  <resources>
193
  <sales_setup>
@@ -501,6 +507,18 @@
501
  </pb_generateASN>
502
  </jobs>
503
  </crontab>
 
 
 
 
 
 
 
 
 
 
 
 
504
  <adminhtml>
505
  <events>
506
  <!--<sales_order_save_commit_after>-->
@@ -523,15 +541,38 @@
523
  </observers>
524
  </order_cancel_after>
525
  </events>
526
- <!--<translate>-->
527
- <!--<modules>-->
528
- <!--<translations>-->
529
- <!--<files>-->
530
- <!--<default>Pb_Pbgsp.csv</default>-->
531
- <!--</files>-->
532
- <!--</translations>-->
533
- <!--</modules>-->
534
- <!--</translate>-->
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
535
  </adminhtml>
536
 
537
  </config>
2
  <config>
3
  <modules>
4
  <Pb_Pbgsp>
5
+ <version>1.3.0</version>
6
  </Pb_Pbgsp>
7
  </modules>
8
  <global>
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>
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>-->
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>
app/code/local/Pb/Pbgsp/etc/system.xml_bk DELETED
@@ -1,453 +0,0 @@
1
- <?xml version="1.0"?>
2
- <config>
3
- <sections>
4
- <carriers>
5
- <groups>
6
- <pbgsp translate="label" module="shipping">
7
- <label>Pitney Bowes PBGSP</label>
8
- <frontend_type>text</frontend_type>
9
- <sort_order>13</sort_order>
10
- <show_in_default>1</show_in_default>
11
- <show_in_website>1</show_in_website>
12
- <show_in_store>1</show_in_store>
13
- <fields>
14
- <active translate="label">
15
- <label>Enabled</label>
16
- <frontend_type>select</frontend_type>
17
- <source_model>adminhtml/system_config_source_yesno</source_model>
18
- <sort_order>1</sort_order>
19
- <show_in_default>1</show_in_default>
20
- <show_in_website>1</show_in_website>
21
- <show_in_store>1</show_in_store>
22
- </active>
23
- <merchantcode translate="label">
24
- <label>Merchant Code</label>
25
- <frontend_type>text</frontend_type>
26
- <backend_model>adminhtml/system_config_backend_encrypted</backend_model>
27
- <sort_order>10</sort_order>
28
- <show_in_default>1</show_in_default>
29
- <show_in_website>1</show_in_website>
30
- <show_in_store>1</show_in_store>
31
- </merchantcode>
32
- <authorization_endpoint translate="label">
33
- <label>Authorization Endpoint</label>
34
- <frontend_type>text</frontend_type>
35
- <sort_order>15</sort_order>
36
- <show_in_default>1</show_in_default>
37
- <show_in_website>1</show_in_website>
38
- <show_in_store>1</show_in_store>
39
- </authorization_endpoint>
40
- <checkout_endpoint translate="label">
41
- <label>Checkout Endpoint</label>
42
- <frontend_type>text</frontend_type>
43
- <sort_order>16</sort_order>
44
- <show_in_default>1</show_in_default>
45
- <show_in_website>1</show_in_website>
46
- <show_in_store>1</show_in_store>
47
- </checkout_endpoint>
48
- <order_mgmt_api translate="label">
49
- <label>ASN Endpoint</label>
50
- <frontend_type>text</frontend_type>
51
-
52
- <sort_order>17</sort_order>
53
- <show_in_default>1</show_in_default>
54
- <show_in_website>1</show_in_website>
55
- <show_in_store>1</show_in_store>
56
- </order_mgmt_api>
57
- <apiuser translate="label">
58
- <label>API username</label>
59
- <frontend_type>text</frontend_type>
60
- <backend_model>adminhtml/system_config_backend_encrypted</backend_model>
61
- <sort_order>20</sort_order>
62
- <show_in_default>1</show_in_default>
63
- <show_in_website>1</show_in_website>
64
- <show_in_store>1</show_in_store>
65
- </apiuser>
66
- <apipass translate="label">
67
- <label>API password</label>
68
- <frontend_type>password</frontend_type>
69
- <backend_model>adminhtml/system_config_backend_encrypted</backend_model>
70
- <sort_order>30</sort_order>
71
- <show_in_default>1</show_in_default>
72
- <show_in_website>1</show_in_website>
73
- <show_in_store>1</show_in_store>
74
- </apipass>
75
- <ftpuser translate="label">
76
- <label>SFTP username</label>
77
- <frontend_type>text</frontend_type>
78
- <backend_model>adminhtml/system_config_backend_encrypted</backend_model>
79
- <sort_order>40</sort_order>
80
- <show_in_default>1</show_in_default>
81
- <show_in_website>1</show_in_website>
82
- <show_in_store>1</show_in_store>
83
- </ftpuser>
84
- <ftppass translate="label">
85
- <label>SFTP password</label>
86
- <frontend_type>password</frontend_type>
87
- <backend_model>adminhtml/system_config_backend_encrypted</backend_model>
88
- <sort_order>50</sort_order>
89
- <show_in_default>1</show_in_default>
90
- <show_in_website>1</show_in_website>
91
- <show_in_store>1</show_in_store>
92
- </ftppass>
93
- <ftphost translate="label">
94
- <label>SFTP hostname</label>
95
- <frontend_type>text</frontend_type>
96
- <sort_order>60</sort_order>
97
- <show_in_default>1</show_in_default>
98
- <show_in_website>1</show_in_website>
99
- <show_in_store>1</show_in_store>
100
- </ftphost>
101
- <ftpport translate="label">
102
- <label>SFTP port</label>
103
- <frontend_type>text</frontend_type>
104
- <sort_order>70</sort_order>
105
- <show_in_default>1</show_in_default>
106
- <show_in_website>1</show_in_website>
107
- <show_in_store>1</show_in_store>
108
- </ftpport>
109
- <ftpdir translate="label">
110
- <label>SFTP catalog directory</label>
111
- <frontend_type>text</frontend_type>
112
- <backend_model>adminhtml/system_config_backend_encrypted</backend_model>
113
- <sort_order>80</sort_order>
114
- <show_in_default>1</show_in_default>
115
- <show_in_website>1</show_in_website>
116
- <show_in_store>1</show_in_store>
117
- </ftpdir>
118
- <catalog_diff translate="label">
119
- <label>Catalog update period (hours, min 1 hour)</label>
120
- <frontend_type>text</frontend_type>
121
- <sort_order>90</sort_order>
122
- <show_in_default>1</show_in_default>
123
- <show_in_website>1</show_in_website>
124
- <show_in_store>1</show_in_store>
125
- </catalog_diff>
126
- <catalog_full translate="label">
127
- <label>Full catalog upload period (days)</label>
128
- <frontend_type>text</frontend_type>
129
- <sort_order>100</sort_order>
130
- <show_in_default>1</show_in_default>
131
- <show_in_website>1</show_in_website>
132
- <show_in_store>1</show_in_store>
133
- </catalog_full>
134
- <catalog_size translate="label">
135
- <label>Maximum Records Per File</label>
136
- <frontend_type>text</frontend_type>
137
- <validate>validate-number</validate>
138
- <sort_order>105</sort_order>
139
- <show_in_default>1</show_in_default>
140
- <show_in_website>1</show_in_website>
141
- <show_in_store>1</show_in_store>
142
- </catalog_size>
143
- <catalog_sender_id translate="label">
144
- <label>Catalog Sender ID</label>
145
- <frontend_type>text</frontend_type>
146
-
147
- <sort_order>106</sort_order>
148
- <show_in_default>1</show_in_default>
149
- <show_in_website>1</show_in_website>
150
- <show_in_store>1</show_in_store>
151
- </catalog_sender_id>
152
- <admin_email translate="label">
153
- <label>Admin Email</label>
154
- <frontend_type>text</frontend_type>
155
- <validate>validate-email</validate>
156
- <sort_order>110</sort_order>
157
- <show_in_default>1</show_in_default>
158
- <show_in_website>1</show_in_website>
159
- <show_in_store>1</show_in_store>
160
- </admin_email>
161
- <catalog_encryption_enabled translate="label">
162
- <label>Catalog Encryption Enabled</label>
163
- <frontend_type>select</frontend_type>
164
- <source_model>adminhtml/system_config_source_yesno</source_model>
165
- <sort_order>115</sort_order>
166
- <show_in_default>1</show_in_default>
167
- <show_in_website>1</show_in_website>
168
- <show_in_store>1</show_in_store>
169
- </catalog_encryption_enabled>
170
- <encryption_public_key translate="label">
171
- <label>Catalog Encryption Public Key</label>
172
- <frontend_type>textarea</frontend_type>
173
- <sort_order>120</sort_order>
174
- <show_in_default>1</show_in_default>
175
- <show_in_website>1</show_in_website>
176
- <show_in_store>1</show_in_store>
177
- </encryption_public_key>
178
- <notify_catalog_ok translate="label">
179
- <label>Notify on Successful Catalog Export</label>
180
- <frontend_type>select</frontend_type>
181
- <source_model>adminhtml/system_config_source_yesno</source_model>
182
- <sort_order>121</sort_order>
183
- <show_in_default>1</show_in_default>
184
- <show_in_website>1</show_in_website>
185
- <show_in_store>1</show_in_store>
186
- </notify_catalog_ok>
187
- <notify_catalog_err translate="label">
188
- <label>Notify on Catalog Export Failure</label>
189
- <frontend_type>select</frontend_type>
190
- <source_model>adminhtml/system_config_source_yesno</source_model>
191
- <sort_order>122</sort_order>
192
- <show_in_default>1</show_in_default>
193
- <show_in_website>1</show_in_website>
194
- <show_in_store>1</show_in_store>
195
- </notify_catalog_err>
196
- <asn_generation_enabled translate="label">
197
- <label>Generate ASN</label>
198
- <frontend_type>select</frontend_type>
199
- <source_model>adminhtml/system_config_source_yesno</source_model>
200
- <sort_order>125</sort_order>
201
- <show_in_default>1</show_in_default>
202
- <show_in_website>1</show_in_website>
203
- <show_in_store>1</show_in_store>
204
- </asn_generation_enabled>
205
- <override_shipping_address_enabled translate="label">
206
- <label>Override Shipping Address</label>
207
- <frontend_type>select</frontend_type>
208
- <source_model>adminhtml/system_config_source_yesno</source_model>
209
- <sort_order>128</sort_order>
210
- <show_in_default>1</show_in_default>
211
- <show_in_website>1</show_in_website>
212
- <show_in_store>1</show_in_store>
213
- </override_shipping_address_enabled>
214
-
215
- <!--
216
- If the free_shipping_enable flag enable, the system will check free_shipping_subtotal to give free shipping
217
- otherwise will use shopping cart price rule behaviour
218
- -->
219
- <free_shipping_enable translate="label">
220
- <label>Free shipping with minimum order amount</label>
221
- <frontend_type>select</frontend_type>
222
- <source_model>adminhtml/system_config_source_enabledisable</source_model>
223
- <sort_order>160</sort_order>
224
- <show_in_default>1</show_in_default>
225
- <show_in_website>1</show_in_website>
226
- <show_in_store>1</show_in_store>
227
- </free_shipping_enable>
228
- <free_shipping_subtotal translate="label">
229
- <label>Minimum order amount for free shipping</label>
230
- <frontend_type>text</frontend_type>
231
- <sort_order>170</sort_order>
232
- <show_in_default>1</show_in_default>
233
- <show_in_website>1</show_in_website>
234
- <show_in_store>1</show_in_store>
235
- </free_shipping_subtotal>
236
- <free_tax_enable translate="label">
237
- <label>Enable zero tax for customer</label>
238
- <frontend_type>select</frontend_type>
239
- <source_model>adminhtml/system_config_source_enabledisable</source_model>
240
- <sort_order>175</sort_order>
241
- <show_in_default>1</show_in_default>
242
- <show_in_website>1</show_in_website>
243
- <show_in_store>1</show_in_store>
244
- </free_tax_enable>
245
-
246
- <sort_order translate="label">
247
- <label>Sort order</label>
248
- <frontend_type>text</frontend_type>
249
- <sort_order>230</sort_order>
250
- <show_in_default>1</show_in_default>
251
- <show_in_website>1</show_in_website>
252
- <show_in_store>1</show_in_store>
253
- </sort_order>
254
- <title translate="label">
255
- <label>Title</label>
256
- <validate>required-entry</validate>
257
- <frontend_type>text</frontend_type>
258
- <validate>required-entry</validate>
259
- <sort_order>240</sort_order>
260
- <show_in_default>1</show_in_default>
261
- <show_in_website>1</show_in_website>
262
- <show_in_store>1</show_in_store>
263
- </title>
264
- <!-- added by BigPixel 6/5/2012 -->
265
- <handlingfee translate="label">
266
- <label>Handling Fee</label>
267
- <frontend_type>text</frontend_type>
268
- <sort_order>241</sort_order>
269
- <show_in_default>1</show_in_default>
270
- <show_in_website>1</show_in_website>
271
- <show_in_store>1</show_in_store>
272
- </handlingfee>
273
- <handlingoption translate="label">
274
- <label>Handling Fee Apply As</label>
275
- <frontend_type>select</frontend_type>
276
- <source_model>pb_pbgsp/handlingoptions</source_model>
277
- <sort_order>242</sort_order>
278
- <show_in_default>1</show_in_default>
279
- <show_in_website>1</show_in_website>
280
- <show_in_store>1</show_in_store>
281
- </handlingoption>
282
- <domestic_shipping_fee translate="label">
283
- <label>Domestic Shipping Fee</label>
284
- <frontend_type>text</frontend_type>
285
- <sort_order>243</sort_order>
286
- <show_in_default>1</show_in_default>
287
- <show_in_website>1</show_in_website>
288
- <show_in_store>1</show_in_store>
289
- </domestic_shipping_fee>
290
- <domestic_shipping_option translate="label">
291
- <label>Apply Domestic shipping fee as</label>
292
- <frontend_type>select</frontend_type>
293
- <source_model>pb_pbgsp/handlingoptions</source_model>
294
- <sort_order>244</sort_order>
295
- <show_in_default>1</show_in_default>
296
- <show_in_website>1</show_in_website>
297
- <show_in_store>1</show_in_store>
298
- </domestic_shipping_option>
299
- <delivery_adjustment_min_days translate="label">
300
- <label>Minimum Delivery Days to PB Hub</label>
301
- <frontend_type>text</frontend_type>
302
- <validate>validate-number</validate>
303
- <sort_order>245</sort_order>
304
- <show_in_default>1</show_in_default>
305
- <show_in_website>1</show_in_website>
306
- <show_in_store>1</show_in_store>
307
- </delivery_adjustment_min_days>
308
- <delivery_adjustment_max_days translate="label">
309
- <label>Maximum Delivery Days to PB Hub</label>
310
- <frontend_type>text</frontend_type>
311
- <validate>validate-number</validate>
312
- <sort_order>246</sort_order>
313
- <show_in_default>1</show_in_default>
314
- <show_in_website>1</show_in_website>
315
- <show_in_store>1</show_in_store>
316
- </delivery_adjustment_max_days>
317
- <!-- added by BigPixel 6/5/2012 -->
318
- <sallowspecific translate="label">
319
- <label>Ship to applicable countries</label>
320
- <frontend_type>select</frontend_type>
321
- <sort_order>250</sort_order>
322
- <frontend_class>shipping-applicable-country</frontend_class>
323
- <source_model>adminhtml/system_config_source_shipping_allspecificcountries</source_model>
324
- <show_in_default>1</show_in_default>
325
- <show_in_website>1</show_in_website>
326
- <show_in_store>1</show_in_store>
327
- </sallowspecific>
328
- <specificcountry translate="label">
329
- <label>Ship to Specific countries</label>
330
- <frontend_type>multiselect</frontend_type>
331
- <sort_order>251</sort_order>
332
- <source_model>adminhtml/system_config_source_country</source_model>
333
- <show_in_default>1</show_in_default>
334
- <show_in_website>1</show_in_website>
335
- <show_in_store>1</show_in_store>
336
- </specificcountry>
337
- <showmethod translate="label">
338
- <label>Show Method if Not Applicable</label>
339
- <frontend_type>select</frontend_type>
340
- <sort_order>260</sort_order>
341
- <frontend_class>shipping-skip-hide</frontend_class>
342
- <source_model>adminhtml/system_config_source_yesno</source_model>
343
- <show_in_default>1</show_in_default>
344
- <show_in_website>1</show_in_website>
345
- <show_in_store>0</show_in_store>
346
- </showmethod>
347
- <specificerrmsg translate="label">
348
- <label>Displayed Error Message</label>
349
- <frontend_type>textarea</frontend_type>
350
- <sort_order>270</sort_order>
351
- <show_in_default>1</show_in_default>
352
- <show_in_website>1</show_in_website>
353
- <show_in_store>1</show_in_store>
354
- </specificerrmsg>
355
- <!-- test comments -->
356
- <trackinglink translate="label">
357
- <label>Enable Tracking Links</label>
358
- <frontend_type>select</frontend_type>
359
- <source_model>adminhtml/system_config_source_yesno</source_model>
360
- <sort_order>271</sort_order>
361
- <show_in_default>1</show_in_default>
362
- <show_in_website>1</show_in_website>
363
- <show_in_store>1</show_in_store>
364
- </trackinglink>
365
- <suppress_domestic_tracking translate="label">
366
- <label>Suppress Domestic Leg Tracking</label>
367
- <frontend_type>select</frontend_type>
368
- <sort_order>280</sort_order>
369
- <frontend_class>shipping-skip-hide</frontend_class>
370
- <source_model>adminhtml/system_config_source_yesno</source_model>
371
- <show_in_default>1</show_in_default>
372
- <show_in_website>1</show_in_website>
373
- <show_in_store>1</show_in_store>
374
- </suppress_domestic_tracking>
375
- <custom_shipment_email_subject translate="label">
376
- <label>Custom Shipment Email Subject</label>
377
- <frontend_type>text</frontend_type>
378
-
379
- <sort_order>281</sort_order>
380
- <show_in_default>1</show_in_default>
381
- <show_in_website>1</show_in_website>
382
- <show_in_store>1</show_in_store>
383
- </custom_shipment_email_subject>
384
- <custom_shipment_email_template>
385
- <label>Custom Shipment Email</label>
386
- <frontend_type>textarea</frontend_type>
387
- <sort_order>282</sort_order>
388
- <show_in_default>1</show_in_default>
389
- <show_in_website>1</show_in_website>
390
- <show_in_store>1</show_in_store>
391
- </custom_shipment_email_template>
392
- <separate_log_file translate="label">
393
- <label>Log in separate file</label>
394
- <frontend_type>select</frontend_type>
395
- <sort_order>283</sort_order>
396
- <frontend_class>shipping-skip-hide</frontend_class>
397
- <source_model>adminhtml/system_config_source_yesno</source_model>
398
- <show_in_default>1</show_in_default>
399
- <show_in_website>1</show_in_website>
400
- <show_in_store>1</show_in_store>
401
- </separate_log_file>
402
- <return_address_street1 translate="label">
403
- <label>Return Address Street 1</label>
404
- <frontend_type>text</frontend_type>
405
-
406
- <sort_order>284</sort_order>
407
- <show_in_default>1</show_in_default>
408
- <show_in_website>1</show_in_website>
409
- <show_in_store>1</show_in_store>
410
- </return_address_street1>
411
- <return_address_city translate="label">
412
- <label>Return Address City</label>
413
- <frontend_type>text</frontend_type>
414
-
415
- <sort_order>285</sort_order>
416
- <show_in_default>1</show_in_default>
417
- <show_in_website>1</show_in_website>
418
- <show_in_store>1</show_in_store>
419
- </return_address_city>
420
- <return_address_state translate="label">
421
- <label>Province/State</label>
422
- <frontend_type>text</frontend_type>
423
-
424
- <sort_order>286</sort_order>
425
- <show_in_default>1</show_in_default>
426
- <show_in_website>1</show_in_website>
427
- <show_in_store>1</show_in_store>
428
- </return_address_state>
429
- <return_address_country translate="label">
430
- <label>Country</label>
431
- <frontend_type>select</frontend_type>
432
- <source_model>adminhtml/system_config_source_country</source_model>
433
- <sort_order>287</sort_order>
434
- <show_in_default>1</show_in_default>
435
- <show_in_website>1</show_in_website>
436
- <show_in_store>1</show_in_store>
437
- </return_address_country>
438
- <return_address_zip translate="label">
439
- <label>Zip or Postal Code</label>
440
- <frontend_type>text</frontend_type>
441
-
442
- <sort_order>288</sort_order>
443
- <show_in_default>1</show_in_default>
444
- <show_in_website>1</show_in_website>
445
- <show_in_store>1</show_in_store>
446
- </return_address_zip>
447
- </fields>
448
- </pbgsp>
449
- </groups>
450
- </carriers>
451
-
452
- </sections>
453
- </config>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.2.3)
4
- * Packaged: 2015-11-04T12:13:20+00:00
5
- * Last Modified: 2015-10-21T12:09:20+00:00
6
 
7
 
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
 
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.2.3)
4
- * Packaged: 2015-11-04T12:13:20+00:00
5
- * Last Modified: 2015-10-21T12:09:20+00:00
6
 
7
 
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
 
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.2.3)
4
- * Packaged: 2015-11-04T12:13:20+00:00
5
- * Last Modified: 2015-10-21T12:09:20+00:00
6
 
7
 
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
 
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.2.3)
4
- * Packaged: 2015-11-04T12:13:20+00:00
5
- * Last Modified: 2015-10-21T12:09:20+00:00
6
 
7
 
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
 
app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.2.1-1.2.2.php ADDED
@@ -0,0 +1,55 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Product: Pb_Pbgsp (1.2.2)
4
+ * Packaged: 2015-10-21T12:09:20+00:00
5
+ * Last Modified: 2015-10-07T12:08:45+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
+
20
+
21
+ $eav = Mage::getResourceModel('catalog/setup', 'catalog_setup');
22
+
23
+ $eav->removeAttribute('catalog_product','pb_pbgsp_upload_active');
24
+ $eav->addAttribute('catalog_product', 'pb_pbgsp_upload_active', array(
25
+ 'type' => 'int',
26
+ 'input' => 'select',
27
+ 'label' => 'Export to PBGSP',
28
+ 'source' => 'eav/entity_attribute_source_boolean',
29
+ 'global' => 2,
30
+ 'user_defined' => 0,
31
+ 'required' => 0,
32
+ 'visible' => 1,
33
+ 'default' => 1,
34
+ 'group' => 'PBGSP'
35
+
36
+ ));
37
+
38
+ $eav->removeAttribute('catalog_product','pb_pbgsp_upload_delete');
39
+ $eav->addAttribute('catalog_product', 'pb_pbgsp_upload_delete', array(
40
+ 'type' => 'int',
41
+ 'input' => 'select',
42
+ 'label' => 'Delete from PBGSP',
43
+ 'source' => 'eav/entity_attribute_source_boolean',
44
+ 'global' => 2,
45
+ 'user_defined' => 0,
46
+ 'required' => 0,
47
+ 'visible' => 1,
48
+ 'default' => 1,
49
+ 'group' => 'PBGSP'
50
+
51
+ ));
52
+
53
+
54
+ $installer->endSetup();
55
+ ?>
app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.2.1-1.2.4.php ADDED
@@ -0,0 +1,55 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Product: Pb_Pbgsp (1.2.2)
4
+ * Packaged: 2015-10-21T12:09:20+00:00
5
+ * Last Modified: 2015-10-07T12:08:45+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
+
20
+
21
+ $eav = Mage::getResourceModel('catalog/setup', 'catalog_setup');
22
+
23
+ $eav->removeAttribute('catalog_product','pb_pbgsp_upload_active');
24
+ $eav->addAttribute('catalog_product', 'pb_pbgsp_upload_active', array(
25
+ 'type' => 'int',
26
+ 'input' => 'select',
27
+ 'label' => 'Export to PBGSP',
28
+ 'source' => 'eav/entity_attribute_source_boolean',
29
+ 'global' => 2,
30
+ 'user_defined' => 0,
31
+ 'required' => 0,
32
+ 'visible' => 1,
33
+ 'default' => 1,
34
+
35
+
36
+ ));
37
+
38
+ $eav->removeAttribute('catalog_product','pb_pbgsp_upload_delete');
39
+ $eav->addAttribute('catalog_product', 'pb_pbgsp_upload_delete', array(
40
+ 'type' => 'int',
41
+ 'input' => 'select',
42
+ 'label' => 'Delete from PBGSP',
43
+ 'source' => 'eav/entity_attribute_source_boolean',
44
+ 'global' => 2,
45
+ 'user_defined' => 0,
46
+ 'required' => 0,
47
+ 'visible' => 1,
48
+ 'default' => 1,
49
+
50
+
51
+ ));
52
+
53
+
54
+ $installer->endSetup();
55
+ ?>
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>pitneybowes_gsp</name>
4
- <version>1.2.3</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License (OSL)</license>
7
  <channel>community</channel>
@@ -24,14 +24,20 @@ To learn more, go to &lt;a href="http://www.pb.com/ecom"&gt;http://www.pb.com/ec
24
  </description>
25
  <notes>Patch release for Magento Connect.&#xD;
26
  &#xD;
27
- 1. Fixed an issue with 3rd party checkout extensions where shipping wouldn&#x2019;t show correctly when switching back and forth between US and International locations&#xD;
28
  &#xD;
29
- 2. Small adjustment to force USD as the user's currency selected during the API call to PB&#xD;
 
 
 
 
 
 
30
  </notes>
31
  <authors><author><name>Raymond Lai</name><user>r3lai</user><email>raymond.lai@pb.com</email></author></authors>
32
- <date>2015-11-04</date>
33
- <time>18:47:47</time>
34
- <contents><target name="magelocal"><dir name="Pb"><dir name="Pbgsp"><dir name="Block"><dir name="Adminhtml"><dir name="Categorysettings"><file name="Grid.php" hash="985639504d88fc092069d21057b5fa02"/></dir><file name="Categorysettings.php" hash="d1f33a7ff42f76b5204f0ce88e75d141"/><dir name="Sales"><dir name="Order"><dir name="Invoice"><file name="Totals.php" hash="eb38619f08dc6170eaf471b1170b9f29"/></dir><file name="Totals.php" hash="0ba9df81639ad92084bdfc0d572acc20"/></dir></dir></dir><dir name="Checkout"><dir name="Shipping"><dir name="Method"><file name="Available.php" hash="ce7f611450185872e7ec346a9ebb9ac2"/></dir></dir></dir><file name="Form.php" hash="c2813a420ed330448f9f5946a72b000d"/><dir name="Sales"><dir name="Order"><dir name="Invoice"><file name="Totals.php" hash="a70e7b7491880f47fcd058e30dc55643"/></dir><file name="Totals.php" hash="ad218028b61221ae258a7216849bc10d"/></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="913682a7e7293d17507e33edf3906da3"/></dir><dir name="Model"><file name="Api.php" hash="45e76f2bbe4cfac503f5e0e0b1a5de5d"/><file name="Authapioptions.php" hash="8cd4e0e89c1bc6b5ca12d502386c89a2"/><dir name="Carrier"><file name="ShippingMethod.php" hash="f68de9304d71d5ac136fe0c41523fba3"/></dir><dir name="Catalog"><file name="Category.php" hash="0c3f01ccf67bb532138d70f8d626347d"/><file name="Cron.php" hash="6b3ea5e0f33068d318a450920a5c7c9b"/><file name="File.php" hash="57ad4d3da039c3ed307520d19e83746d"/><file name="Product.php" hash="77931d4d4d24010a5ccd45aaa434b430"/></dir><file name="Credentials.php" hash="24936c9272461d5333283fa72ec54716"/><dir name="Creditmemo"><file name="Duty.php" hash="b67048f5088954096caa871789817d40"/></dir><file name="Environmentconfig.php" hash="d341f298c2f9e84cb90a47aa4c7f0b8e"/><file name="Handlingoptions.php" hash="221260925aa26d3b1e595cb7f9a6dc91"/><file name="Helper.php" hash="a8aa1e7dec2be22bc78938233b2b668e"/><file name="Inboundparcel.php" hash="1fc904e1ced54a84ba94bfbcaeb820b4"/><dir name="Invoice"><file name="Duty.php" hash="2b14727e109c9f4b2beb2aa64112f12b"/></dir><file name="Messages.php" hash="a505c254053c5e81ee22fb69fa261832"/><dir name="Mysql4"><dir name="Inboundparcel"><file name="Collection.php" hash="1a88146127babb270e357c0c5d3a1997"/></dir><file name="Inboundparcel.php" hash="b6c1b87ed143c6957699c80641ffc559"/><dir name="Ordernumber"><file name="Collection.php" hash="1bb79937e64dafb11ee9b3653a2b5d59"/></dir><file name="Ordernumber.php" hash="1b72a2db9cf84b9ad0fde3c8eb972f73"/><dir name="Variable"><file name="Collection.php" hash="78c0b6dac51295f9fbc093ee4d10f2bb"/></dir><file name="Variable.php" hash="c483cc0933e290c05b98b84561562a17"/></dir><file name="Observer.php" hash="352870225467d8a2c769117a9f2d1c68"/><file name="Ordernumber.php" hash="85e0dbde5bbe09db79915c6fee56f2cb"/><dir name="Pdf"><file name="Tax.php" hash="a4740e61dcf58c0ae9a138fb48fa98e2"/></dir><dir name="Quote"><file name="Duty.php" hash="1894b81db59adf2cee1aa44d5d5de8e7"/></dir><dir name="Resource"><dir name="Mysql4"><file name="Setup.php" hash="242905ebb60dc4fae780f97031aa5ee4"/></dir></dir><dir name="Sales"><dir name="Order"><file name="Shipment.php" hash="f4310c5abbc09c6adb05a4168731311b"/></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="f6364676d0067ef7a0ccaccc34b2faf4"/><file name="Variable.php" hash="618112c103f027fcad10b1d5e30add18"/></dir><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="9028d6c9784642e179f27c4250c09e46"/></dir></dir><dir name="etc"><file name="config.xml" hash="6f38916a0f1e7246464d19b1994645d1"/><file name="system.xml" hash="2be42cc9ffc0c6e191c6ad09c6fe28a0"/><file name="system.xml_bk" hash="66ab74c09711ce8ff5a75ba80688c194"/></dir><dir name="sql"><dir name="pbgsp_setup"><file name="mysql4-install-1.0.0.php" hash="d02c1ebee67dc627b3e171de9f698e64"/><file name="mysql4-upgrade-1.0.0-1.0.1.php" hash="c0adff5919648b3c922d31d4b20694a0"/><file name="mysql4-upgrade-1.1.1-1.1.2.php" hash="7d6af3c2cf6cbd0b7422ad23e030cb39"/><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="2b4c7b57f1f8429c2c713d068c1bbe72"/></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="1a943e3863a402058f43b97fb573b2ef"/><file name="PBGSP_Manual_Catalog_Export.php" hash="b63132f42e5448c015f744d8c739065b"/></dir></target></contents>
35
  <compatible/>
36
  <dependencies><required><php><min>5.1.0</min><max>5.6.0</max></php></required></dependencies>
37
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>pitneybowes_gsp</name>
4
+ <version>1.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>
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>