pitneybowes_gsp - Version 1.2.3

Version Notes

Patch release for Magento Connect.

1. Fixed an issue with 3rd party checkout extensions where shipping wouldn’t show correctly when switching back and forth between US and International locations

2. Small adjustment to force USD as the user's currency selected during the API call to PB

Download this release

Release Info

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


Code changes from version 1.2.1 to 1.2.3

Files changed (47) hide show
  1. PBGSP_Manual_Catalog_Export.php +48 -0
  2. ReadMe.txt +13 -0
  3. app/code/local/Pb/Pbgsp/Block/Adminhtml/Categorysettings.php +22 -0
  4. app/code/local/Pb/Pbgsp/Block/Adminhtml/Categorysettings/Grid.php +88 -0
  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 +4 -4
  13. app/code/local/Pb/Pbgsp/Model/Carrier/ShippingMethod.php +9 -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 +8 -4
  17. app/code/local/Pb/Pbgsp/Model/Catalog/Product.php +12 -6
  18. app/code/local/Pb/Pbgsp/Model/Credentials.php +3 -3
  19. app/code/local/Pb/Pbgsp/Model/Creditmemo/Duty.php +3 -3
  20. app/code/local/Pb/Pbgsp/Model/Environmentconfig.php +3 -3
  21. app/code/local/Pb/Pbgsp/Model/Handlingoptions.php +3 -3
  22. app/code/local/Pb/Pbgsp/Model/Helper.php +3 -3
  23. app/code/local/Pb/Pbgsp/Model/Inboundparcel.php +3 -3
  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 +3 -3
  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/Quote/Duty.php +18 -6
  36. app/code/local/Pb/Pbgsp/Model/Resource/Mysql4/Setup.php +3 -3
  37. app/code/local/Pb/Pbgsp/Model/Sales/Order/Shipment.php +3 -3
  38. app/code/local/Pb/Pbgsp/Model/Util.php +3 -3
  39. app/code/local/Pb/Pbgsp/Model/Variable.php +3 -3
  40. app/code/local/Pb/Pbgsp/controllers/Adminhtml/CategorysettingsController.php +43 -0
  41. app/code/local/Pb/Pbgsp/data/pb_pbgsp_setup/data-install-1.0.0.php +3 -3
  42. app/code/local/Pb/Pbgsp/etc/config.xml +1 -1
  43. app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php +3 -3
  44. app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.0.0-1.0.1.php +3 -3
  45. app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.1.1-1.1.2.php +3 -3
  46. app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.2.0-1.2.1.php +3 -3
  47. package.xml +6 -12
PBGSP_Manual_Catalog_Export.php ADDED
@@ -0,0 +1,48 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+
3
+ ini_set('display_errors', 1);
4
+ error_reporting(E_ALL | E_STRICT);
5
+
6
+ $mageFilename = 'app/Mage.php';
7
+ require_once $mageFilename;
8
+
9
+ umask(0);
10
+ $mageRunCode = isset($_SERVER['MAGE_RUN_CODE']) ? $_SERVER['MAGE_RUN_CODE'] : '';
11
+ $mageRunType = isset($_SERVER['MAGE_RUN_TYPE']) ? $_SERVER['MAGE_RUN_TYPE'] : 'store';
12
+
13
+ Mage::app($mageRunCode, $mageRunType);
14
+ //Mage::setIsDeveloperMode(true);
15
+
16
+ Mage::app()->setCurrentStore(Mage_Core_Model_App::ADMIN_STORE_ID);
17
+
18
+
19
+ class TestClass {
20
+ public static function TestExport() {
21
+ $pbExport = Mage::getModel('pb_pbgsp/catalog_cron');
22
+ $pbExport->catalogSync();
23
+ //$pbExport->processStatusNotifications();
24
+ Mage::log('Catalog sync process completed successfully');
25
+ echo 'Catalog sync process completed successfully';
26
+
27
+
28
+ }
29
+
30
+
31
+ public static function testProcessNotification() {
32
+ $pbExport = Mage::getModel('pb_pbgsp/catalog_cron');
33
+
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();
44
+ }
45
+
46
+ //
47
+ ?>
48
+
ReadMe.txt CHANGED
@@ -31,6 +31,19 @@ In order to take advantage of the file encryption setting in the extension confi
31
  ========================================================
32
  CHANGELOG
33
  ========================================================
 
 
 
 
 
 
 
 
 
 
 
 
 
34
 
35
  v. 1.2.1
36
 
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
37
+
38
+ Small adjustment to force USD as the user's currency selected during the API call to PB
39
+
40
+
41
+ v. 1.2.2
42
+
43
+ Fixed an issue where the RH_CATEGORY_ID_PATH had a leading zero in the child category ID. This was causing duplicate categories in the PB system
44
+
45
+ Created a manual catalog export tool to be used at the command line. A new file is added at magento root directory: PBGSP_Manual_Catalog_Export.php
46
+
47
 
48
  v. 1.2.1
49
 
app/code/local/Pb/Pbgsp/Block/Adminhtml/Categorysettings.php ADDED
@@ -0,0 +1,22 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
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 {
10
+
11
+ public function __construct()
12
+ {
13
+ $this->_controller = 'adminhtml_categorysettings';
14
+ $this->_blockGroup = 'PB_Pbgsp';
15
+ $this->_headerText = 'Category Export Settings';
16
+ //$class = Mage::getConfig()->getBlockClassName($this->_blockGroup.'/' . $this->_controller . '_grid');
17
+ //var_dump($class);
18
+ parent::__construct();
19
+ $this->_removeButton('add');
20
+ }
21
+
22
+ }
app/code/local/Pb/Pbgsp/Block/Adminhtml/Categorysettings/Grid.php ADDED
@@ -0,0 +1,88 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
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 {
10
+ public function __construct()
11
+ {
12
+ parent::__construct();
13
+ $this->setId('categorysettingsGrid');
14
+ $this->setDefaultSort('entity_id');
15
+ $this->setDefaultDir('ASC');
16
+ $this->setUseAjax(true);
17
+ $this->setSaveParametersInSession(true);
18
+ }
19
+
20
+ protected function _prepareCollection()
21
+ {
22
+ $categories = Mage::getModel('catalog/category')
23
+ ->getCollection()
24
+
25
+ ->addAttributeToSelect('name')
26
+ ->addAttributeToSelect('pb_pbgsp_upload_active');
27
+ $this->setCollection($categories);
28
+ return parent::_prepareCollection();
29
+ }
30
+
31
+ protected function _prepareColumns()
32
+ {
33
+ $this->addColumn('ID', array(
34
+ 'header' => 'ID',
35
+ 'align' =>'right',
36
+ 'width' => '10px',
37
+ 'index' => 'entity_id',
38
+ 'type' => 'number',
39
+ ));
40
+
41
+ $this->addColumn('name', array(
42
+ 'header' => 'Name',
43
+ 'align' =>'left',
44
+ 'index' => 'name',
45
+ // 'width' => '50px',
46
+ ));
47
+
48
+
49
+ $this->addColumn('export', array(
50
+ 'header' => 'Export',
51
+ //'width' => '150px',
52
+ 'index' => 'pb_pbgsp_upload_active',
53
+ 'type' => 'options',
54
+ 'options' => array(1=>'Yes',0=>'No')
55
+ ));
56
+ return parent::_prepareColumns();
57
+ }
58
+ protected function _prepareMassaction()
59
+ {
60
+ $this->setMassactionIdField('entity_id');
61
+ $this->getMassactionBlock()->setFormFieldName('category');
62
+
63
+ // $this->getMassactionBlock()->addItem('delete', array(
64
+ // 'label'=> Mage::helper('udropship')->__('Delete'),
65
+ // 'url' => $this->getUrl('*/*/massDelete'),
66
+ // 'confirm' => Mage::helper('udropship')->__('Are you sure?')
67
+ // ));
68
+
69
+ $this->getMassactionBlock()->addItem('status', array(
70
+ 'label'=>'Change status',
71
+ 'url' => $this->getUrl('*/*/massStatus', array('_current'=>true)),
72
+ 'additional' => array(
73
+ 'status' => array(
74
+ 'name' => 'status',
75
+ 'type' => 'select',
76
+ 'class' => 'required-entry',
77
+ 'label' => 'Export ?',
78
+ 'values' => array(1=>'Yes',0=>'No'),
79
+ )
80
+ )
81
+ ));
82
+
83
+
84
+
85
+
86
+ return $this;
87
+ }
88
+ }
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.1)
5
- * Packaged: 2015-10-07T12:08:45+00:00
6
- * Last Modified: 2015-10-01T12:11:15+00:00
7
 
8
 
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
 
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.1)
5
- * Packaged: 2015-10-07T12:08:45+00:00
6
- * Last Modified: 2015-10-01T12:11:15+00:00
7
 
8
 
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
 
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.1)
5
- * Packaged: 2015-10-07T12:08:45+00:00
6
- * Last Modified: 2015-10-01T12:11:15+00:00
7
 
8
 
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
 
app/code/local/Pb/Pbgsp/Block/Form.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.2.1)
4
- * Packaged: 2015-10-07T12:08:45+00:00
5
- * Last Modified: 2015-10-01T12:11:15+00:00
6
 
7
 
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
 
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.1)
5
- * Packaged: 2015-10-07T12:08:45+00:00
6
- * Last Modified: 2015-10-01T12:11:15+00:00
7
 
8
 
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
 
app/code/local/Pb/Pbgsp/Block/Sales/Order/Totals.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.2.1)
4
- * Packaged: 2015-10-07T12:08:45+00:00
5
- * Last Modified: 2015-10-01T12:11:15+00:00
6
 
7
 
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
 
app/code/local/Pb/Pbgsp/Helper/Data.php ADDED
@@ -0,0 +1,6 @@
 
 
 
 
 
 
1
+ <?php
2
+
3
+ class Pb_Pbgsp_Helper_Data extends Mage_Core_Helper_Abstract
4
+ {
5
+
6
+ }
app/code/local/Pb/Pbgsp/Model/Api.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.2.1)
4
- * Packaged: 2015-10-07T12:08:45+00:00
5
- * Last Modified: 2015-10-01T12:11:15+00:00
6
 
7
 
8
 
@@ -236,7 +236,7 @@ class Pb_Pbgsp_Model_Api
236
  'country' => $address->getCountryId(),
237
  'postalOrZipCode' => $address->getPostcode()
238
  );
239
- $currency = Mage::app()->getStore()->getCurrentCurrencyCode();
240
  $basket = array(
241
  'merchantId' => Pb_Pbgsp_Model_Credentials::getMerchantCode(),
242
  'purchaserIPAddress' => self::getClientIP(),
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
 
236
  'country' => $address->getCountryId(),
237
  'postalOrZipCode' => $address->getPostcode()
238
  );
239
+ $currency = 'USD';//Mage::app()->getStore()->getCurrentCurrencyCode();
240
  $basket = array(
241
  'merchantId' => Pb_Pbgsp_Model_Credentials::getMerchantCode(),
242
  'purchaserIPAddress' => self::getClientIP(),
app/code/local/Pb/Pbgsp/Model/Carrier/ShippingMethod.php CHANGED
@@ -1,9 +1,9 @@
1
  <?php
2
 
3
  /**
4
- * Product: Pb_Pbgsp (1.2.1)
5
- * Packaged: 2015-10-07T12:08:45+00:00
6
- * Last Modified: 2015-10-01T12:11:15+00:00
7
 
8
 
9
 
@@ -185,6 +185,9 @@ class Pb_Pbgsp_Model_Carrier_ShippingMethod extends Mage_Shipping_Model_Carrier_
185
  */
186
  public function collectRates(Mage_Shipping_Model_Rate_Request $request)
187
  {
 
 
 
188
  //Pb_Pbgsp_Model_Util::log('Pb_Pbgsp_Model_Carrier_ShippingMethod.collectRates ' . Mage::getStoreConfig('carriers/'.$this->_code.'/active'));
189
  // skip if not enabled
190
  if (!Mage::getStoreConfig('carriers/'.$this->_code.'/active')) {
@@ -295,6 +298,9 @@ class Pb_Pbgsp_Model_Carrier_ShippingMethod extends Mage_Shipping_Model_Carrier_
295
  //if($e->getMessage() == '')
296
  $message = "We've received an unexpected error while getting your quote. Please try again. If the error persists contact magentosupport@pb.com.";
297
  $this->_addError($result,$message);
 
 
 
298
 
299
  }
300
  return $result;
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
 
185
  */
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
193
  if (!Mage::getStoreConfig('carriers/'.$this->_code.'/active')) {
298
  //if($e->getMessage() == '')
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
  }
306
  return $result;
app/code/local/Pb/Pbgsp/Model/Catalog/Category.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.2.1)
4
- * Packaged: 2015-10-07T12:08:45+00:00
5
- * Last Modified: 2015-10-01T12:11:15+00:00
6
 
7
 
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
 
app/code/local/Pb/Pbgsp/Model/Catalog/Cron.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.2.1)
4
- * Packaged: 2015-10-07T12:08:45+00:00
5
- * Last Modified: 2015-10-01T12:11:15+00:00
6
 
7
 
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
 
app/code/local/Pb/Pbgsp/Model/Catalog/File.php CHANGED
@@ -1,9 +1,9 @@
1
  <?php
2
 
3
  /**
4
- * Product: Pb_Pbgsp (1.2.1)
5
- * Packaged: 2015-10-07T12:08:45+00:00
6
- * Last Modified: 2015-10-01T12:11:15+00:00
7
 
8
 
9
 
@@ -237,7 +237,11 @@ class Pb_Pbgsp_Model_Catalog_File {
237
  $prodCat = $category;
238
  $cIds = explode('/',$prodCat->getPath());
239
  $cIds = array_slice($cIds,1);//remove root category
240
- $prodCat->setData('id_path',implode(':',$cIds));
 
 
 
 
241
  $prodCat->setData('name_path',$this->_getCatNamePath($addedCategories,$cIds));
242
  if($product->getTypeId() == 'configurable' ) {
243
  $productType = $product->getTypeInstance(true);
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
 
237
  $prodCat = $category;
238
  $cIds = explode('/',$prodCat->getPath());
239
  $cIds = array_slice($cIds,1);//remove root category
240
+ $catForIdPath = array();
241
+ foreach($cIds as $cid) {
242
+ $catForIdPath[] = intval($cid); //to remove leading zero
243
+ }
244
+ $prodCat->setData('id_path',implode(':',$catForIdPath));
245
  $prodCat->setData('name_path',$this->_getCatNamePath($addedCategories,$cIds));
246
  if($product->getTypeId() == 'configurable' ) {
247
  $productType = $product->getTypeInstance(true);
app/code/local/Pb/Pbgsp/Model/Catalog/Product.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.2.1)
4
- * Packaged: 2015-10-07T12:08:45+00:00
5
- * Last Modified: 2015-10-01T12:11:15+00:00
6
 
7
 
8
 
@@ -57,9 +57,15 @@ class Pb_Pbgsp_Model_Catalog_Product {
57
  * @return string
58
  */
59
  public function getURL() {
60
- if($this->_productUrl)
61
- return $this->_productUrl;
62
- return $this -> product -> getProductUrl();
 
 
 
 
 
 
63
  }
64
 
65
  /**
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
 
57
  * @return string
58
  */
59
  public function getURL() {
60
+ $url = '';
61
+ if($this->_productUrl) {
62
+ $url = $this->_productUrl;
63
+ }
64
+ else {
65
+ $url = $this -> product -> getProductUrl();
66
+ }
67
+ $url = str_replace('PBGSP_Manual_Catalog_Export.php','index.php',$url);
68
+ return $url;
69
  }
70
 
71
  /**
app/code/local/Pb/Pbgsp/Model/Credentials.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.2.1)
4
- * Packaged: 2015-10-07T12:08:45+00:00
5
- * Last Modified: 2015-10-01T12:11:15+00:00
6
 
7
 
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
 
app/code/local/Pb/Pbgsp/Model/Creditmemo/Duty.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.2.1)
4
- * Packaged: 2015-10-07T12:08:45+00:00
5
- * Last Modified: 2015-10-01T12:11:15+00:00
6
 
7
 
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
 
app/code/local/Pb/Pbgsp/Model/Environmentconfig.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.1.2)
4
- * Packaged: 2015-09-14T12:11:20+00:00
5
- * Last Modified: 2015-09-9T12:10:00+00:00
6
 
7
 
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
 
app/code/local/Pb/Pbgsp/Model/Handlingoptions.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.2.1)
4
- * Packaged: 2015-10-07T12:08:45+00:00
5
- * Last Modified: 2015-10-01T12:11:15+00:00
6
 
7
 
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
 
app/code/local/Pb/Pbgsp/Model/Helper.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.2.1)
4
- * Packaged: 2015-10-07T12:08:45+00:00
5
- * Last Modified: 2015-10-01T12:11:15+00:00
6
 
7
 
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
 
app/code/local/Pb/Pbgsp/Model/Inboundparcel.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.2.1)
4
- * Packaged: 2015-10-07T12:08:45+00:00
5
- * Last Modified: 2015-10-01T12:11:15+00:00
6
 
7
 
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
 
app/code/local/Pb/Pbgsp/Model/Invoice/Duty.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.2.1)
4
- * Packaged: 2015-10-07T12:08:45+00:00
5
- * Last Modified: 2015-10-01T12:11:15+00:00
6
 
7
 
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
 
app/code/local/Pb/Pbgsp/Model/Messages.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.2.1)
4
- * Packaged: 2015-10-07T12:08:45+00:00
5
- * Last Modified: 2015-10-01T12:11:15+00:00
6
 
7
 
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
 
app/code/local/Pb/Pbgsp/Model/Mysql4/Inboundparcel.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.2.1)
4
- * Packaged: 2015-10-07T12:08:45+00:00
5
- * Last Modified: 2015-10-01T12:11:15+00:00
6
 
7
 
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
 
app/code/local/Pb/Pbgsp/Model/Mysql4/Inboundparcel/Collection.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.2.1)
4
- * Packaged: 2015-10-07T12:08:45+00:00
5
- * Last Modified: 2015-10-01T12:11:15+00:00
6
 
7
 
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
 
app/code/local/Pb/Pbgsp/Model/Mysql4/Ordernumber.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.2.1)
4
- * Packaged: 2015-10-07T12:08:45+00:00
5
- * Last Modified: 2015-10-01T12:11:15+00:00
6
 
7
 
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
 
app/code/local/Pb/Pbgsp/Model/Mysql4/Ordernumber/Collection.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.2.1)
4
- * Packaged: 2015-10-07T12:08:45+00:00
5
- * Last Modified: 2015-10-01T12:11:15+00:00
6
 
7
 
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
 
app/code/local/Pb/Pbgsp/Model/Mysql4/Variable.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.2.1)
4
- * Packaged: 2015-10-07T12:08:45+00:00
5
- * Last Modified: 2015-10-01T12:11:15+00:00
6
 
7
 
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
 
app/code/local/Pb/Pbgsp/Model/Mysql4/Variable/Collection.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.2.1)
4
- * Packaged: 2015-10-07T12:08:45+00:00
5
- * Last Modified: 2015-10-01T12:11:15+00:00
6
 
7
 
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
 
app/code/local/Pb/Pbgsp/Model/Observer.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.2.1)
4
- * Packaged: 2015-10-07T12:08:45+00:00
5
- * Last Modified: 2015-10-01T12:11:15+00:00
6
 
7
 
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
 
app/code/local/Pb/Pbgsp/Model/Ordernumber.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.2.1)
4
- * Packaged: 2015-10-07T12:08:45+00:00
5
- * Last Modified: 2015-10-01T12:11:15+00:00
6
 
7
 
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
 
app/code/local/Pb/Pbgsp/Model/Pdf/Tax.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.2.1)
4
- * Packaged: 2015-10-07T12:08:45+00:00
5
- * Last Modified: 2015-10-01T12:11:15+00:00
6
 
7
 
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
 
app/code/local/Pb/Pbgsp/Model/Quote/Duty.php CHANGED
@@ -1,9 +1,9 @@
1
  <?php
2
 
3
  /**
4
- * Product: Pb_Pbgsp (1.2.1)
5
- * Packaged: 2015-10-07T12:08:45+00:00
6
- * Last Modified: 2015-10-01T12:11:15+00:00
7
 
8
 
9
 
@@ -47,9 +47,21 @@ class Pb_Pbgsp_Model_Quote_Duty extends Mage_Tax_Model_Sales_Total_Quote_Tax
47
  */
48
  public function collect(Mage_Sales_Model_Quote_Address $address)
49
  {
50
- // Pb_Pbgsp_Model_Util::log('Pb_Pbgsp_Model_Quote_Duty.collect');
51
  parent::collect($address);
52
 
 
 
 
 
 
 
 
 
 
 
 
 
53
  if ($this->getDutyAndTax()) {
54
  $items = $this->_getAddressItems($address);
55
  if (!count($items)) {
@@ -82,8 +94,8 @@ class Pb_Pbgsp_Model_Quote_Duty extends Mage_Tax_Model_Sales_Total_Quote_Tax
82
  //$amount = $address->getTaxAmount();
83
  //$amount = Mage::app()->getStore()->convertPrice($amount);
84
 
85
- $title = "Duty & Taxes";
86
- Pb_Pbgsp_Model_Util::log("Add Duty & Taxes at Duty:" . $amount);
87
  $address->addTotal(array(
88
  'code' => $this->getCode(),
89
  'title' => $title,
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
 
47
  */
48
  public function collect(Mage_Sales_Model_Quote_Address $address)
49
  {
50
+ //Pb_Pbgsp_Model_Util::log('Pb_Pbgsp_Model_Quote_Duty.collect');
51
  parent::collect($address);
52
 
53
+ $allowSpecific = Mage::getStoreConfig('carriers/pbgsp/sallowspecific');
54
+ if($allowSpecific) {
55
+ $activeCountries = Mage::getStoreConfig('carriers/pbgsp/specificcountry');
56
+
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
+ }
64
+ }
65
  if ($this->getDutyAndTax()) {
66
  $items = $this->_getAddressItems($address);
67
  if (!count($items)) {
94
  //$amount = $address->getTaxAmount();
95
  //$amount = Mage::app()->getStore()->convertPrice($amount);
96
 
97
+ $title = "Importation Charges";
98
+ //Pb_Pbgsp_Model_Util::log("Add Duty & Taxes at Duty:" . $amount);
99
  $address->addTotal(array(
100
  'code' => $this->getCode(),
101
  'title' => $title,
app/code/local/Pb/Pbgsp/Model/Resource/Mysql4/Setup.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.2.1)
4
- * Packaged: 2015-10-07T12:08:45+00:00
5
- * Last Modified: 2015-10-01T12:11:15+00:00
6
 
7
 
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
 
app/code/local/Pb/Pbgsp/Model/Sales/Order/Shipment.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.2.1)
4
- * Packaged: 2015-10-07T12:08:45+00:00
5
- * Last Modified: 2015-10-01T12:11:15+00:00
6
 
7
 
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
 
app/code/local/Pb/Pbgsp/Model/Util.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.2.1)
4
- * Packaged: 2015-10-07T12:08:45+00:00
5
- * Last Modified: 2015-10-01T12:11:15+00:00
6
 
7
 
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
 
app/code/local/Pb/Pbgsp/Model/Variable.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.2.1)
4
- * Packaged: 2015-10-07T12:08:45+00:00
5
- * Last Modified: 2015-10-01T12:11:15+00:00
6
 
7
 
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
 
app/code/local/Pb/Pbgsp/controllers/Adminhtml/CategorysettingsController.php ADDED
@@ -0,0 +1,43 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
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 {
10
+
11
+ public function indexAction() {
12
+ $this->loadLayout();
13
+ //$this->_setActiveMenu('sales/udropship');
14
+ // $this->_addBreadcrumb($hlp->__('Vendors'), $hlp->__('Vendors'));
15
+ $this->_addContent($this->getLayout()->createBlock('PB_Pbgsp/adminhtml_categorysettings'));
16
+
17
+ $this->renderLayout();
18
+ }
19
+
20
+ public function massStatusAction()
21
+ {
22
+ $modelIds = (array)$this->getRequest()->getParam('category');
23
+ $status = (string)$this->getRequest()->getParam('status');
24
+
25
+ try {
26
+ foreach ($modelIds as $modelId) {
27
+ Mage::getModel('catalog/category')->load($modelId)->setPbPbgspUploadActive($status)->save();
28
+ }
29
+ $this->_getSession()->addSuccess(
30
+ $this->__('Total of %d record(s) were successfully updated', count($modelIds))
31
+ );
32
+ }
33
+ catch (Mage_Core_Model_Exception $e) {
34
+ $this->_getSession()->addError($e->getMessage());
35
+ }
36
+ catch (Exception $e) {
37
+ $this->_getSession()->addException($e, $this->__('There was an error while updating category(s) export status'));
38
+ }
39
+
40
+ $this->_redirect('*/*/');
41
+ }
42
+
43
+ }
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.1)
4
- * Packaged: 2015-10-07T12:08:45+00:00
5
- * Last Modified: 2015-10-01T12:11:15+00:00
6
 
7
 
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
 
app/code/local/Pb/Pbgsp/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <Pb_Pbgsp>
5
- <version>1.2.1</version>
6
  </Pb_Pbgsp>
7
  </modules>
8
  <global>
2
  <config>
3
  <modules>
4
  <Pb_Pbgsp>
5
+ <version>1.2.3</version>
6
  </Pb_Pbgsp>
7
  </modules>
8
  <global>
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.1)
4
- * Packaged: 2015-10-07T12:08:45+00:00
5
- * Last Modified: 2015-10-01T12:11:15+00:00
6
 
7
 
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
 
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.1)
4
- * Packaged: 2015-10-07T12:08:45+00:00
5
- * Last Modified: 2015-10-01T12:11:15+00:00
6
 
7
 
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
 
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.1)
4
- * Packaged: 2015-10-07T12:08:45+00:00
5
- * Last Modified: 2015-10-01T12:11:15+00:00
6
 
7
 
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
 
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.1)
4
- * Packaged: 2015-10-07T12:08:45+00:00
5
- * Last Modified: 2015-10-01T12:11:15+00:00
6
 
7
 
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
 
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>pitneybowes_gsp</name>
4
- <version>1.2.1</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License (OSL)</license>
7
  <channel>community</channel>
@@ -24,20 +24,14 @@ 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. Added logic in extension preferences to change API URL values dynamically from Sandbox to Production&#xD;
28
  &#xD;
29
- 2. Small adjustment to catalog product URL to use $product-&gt;getUrlInStore() .&#xD;
30
- &#xD;
31
- 3. Add required logic to ensure that the ASN generation logic is triggered no matter the method of shipment creation (manual or programmatically).&#xD;
32
- &#xD;
33
- 4. Fixed an error when the tracking number was not provided for the order.&#xD;
34
- &#xD;
35
- 5. Added backwards compatibility to CE 1.7.x+ and Enterprise 1.9.x&#xD;
36
  </notes>
37
  <authors><author><name>Raymond Lai</name><user>r3lai</user><email>raymond.lai@pb.com</email></author></authors>
38
- <date>2015-10-07</date>
39
- <time>13:13:47</time>
40
- <contents><target name="magelocal"><dir name="Pb"><dir name="Pbgsp"><dir name="Block"><dir name="Adminhtml"><dir name="Sales"><dir name="Order"><dir name="Invoice"><file name="Totals.php" hash="47a66163b654777e330310887b9c71a2"/></dir><file name="Totals.php" hash="ca34fdbdcc87aafece8a8fa56d9b4894"/></dir></dir></dir><dir name="Checkout"><dir name="Shipping"><dir name="Method"><file name="Available.php" hash="0578836807ce728af082300708a5616d"/></dir></dir></dir><file name="Form.php" hash="e9b7566214d2ac8aeca13953961933b0"/><dir name="Sales"><dir name="Order"><dir name="Invoice"><file name="Totals.php" hash="a6f52ffe2b77941af68176f7992e95ca"/></dir><file name="Totals.php" hash="d44af5a3bc4a0a548c27e8a2f7baf4c5"/></dir></dir></dir><dir name="Model"><file name="Api.php" hash="ed61a102a26f4fc079fc9b26c3c0e563"/><file name="Authapioptions.php" hash="8cd4e0e89c1bc6b5ca12d502386c89a2"/><dir name="Carrier"><file name="ShippingMethod.php" hash="c4114b7021ec133743203ee78698a56d"/></dir><dir name="Catalog"><file name="Category.php" hash="e106c28314a00c732989003d84b6e87e"/><file name="Cron.php" hash="4500d19ababff183840f80009550b146"/><file name="File.php" hash="37e16cdd8fc59e0e183730e41345521d"/><file name="Product.php" hash="f9b66ad81c2fdd9edf4f5b078bf3930b"/></dir><file name="Credentials.php" hash="30856e7f080bacb5ff33d2fad12dcc22"/><dir name="Creditmemo"><file name="Duty.php" hash="92b6b45bb85194032ed445cd9bd028b1"/></dir><file name="Environmentconfig.php" hash="3c5c55da46cbc505a79a62aa30bcabf3"/><file name="Handlingoptions.php" hash="2c668ee304fd2c94292e9dee5e9e5990"/><file name="Helper.php" hash="5a16976d01b6a01efc9b08c4e3db5060"/><file name="Inboundparcel.php" hash="4761865c2b4da067535c98ed0e8092a8"/><dir name="Invoice"><file name="Duty.php" hash="f3ad12a0f79a0cff10082830b928ba95"/></dir><file name="Messages.php" hash="f89a614d0b582fecadb0a09035598909"/><dir name="Mysql4"><dir name="Inboundparcel"><file name="Collection.php" hash="88f83cc96d7629befc694cfdef7db206"/></dir><file name="Inboundparcel.php" hash="f580ab1f340c4e79cb4cec26abe266dc"/><dir name="Ordernumber"><file name="Collection.php" hash="613dab5f4a207cec49577bb4bf7551ac"/></dir><file name="Ordernumber.php" hash="c82f42cdbef067b5c1b4b0c726528863"/><dir name="Variable"><file name="Collection.php" hash="0cce896d4e2b2a3489dfade52612559d"/></dir><file name="Variable.php" hash="1b0bb067d7f7b4536486bb2aaf849c8c"/></dir><file name="Observer.php" hash="284a3f5aee7ef5c87269442aca678b6c"/><file name="Ordernumber.php" hash="86c498c90627dab7e3098242945337a2"/><dir name="Pdf"><file name="Tax.php" hash="5567eed41317876b404ed8fef8924e11"/></dir><dir name="Quote"><file name="Duty.php" hash="1d0ac176beb14c700d8a4e4618cdb18f"/></dir><dir name="Resource"><dir name="Mysql4"><file name="Setup.php" hash="52f0c5f12302cee157d5a8a4e2094b39"/></dir></dir><dir name="Sales"><dir name="Order"><file name="Shipment.php" hash="1c06f7701a0100d41700165cb3449f3a"/></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="c38d529f39adc06f9314f675d5220481"/><file name="Variable.php" hash="5a5319c7b77022f88e102987d4a32351"/></dir><dir name="data"><dir name="pb_pbgsp_setup"><file name="data-install-1.0.0.php" hash="ab174aa157896675526a3cb9146f8d01"/></dir></dir><dir name="etc"><file name="config.xml" hash="8bc02ba93ef28ccc270dbb82d942f372"/><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="f9c8ff52ef8cc2dd11bced59dee05a17"/><file name="mysql4-upgrade-1.0.0-1.0.1.php" hash="c25b5c55bfb9b7256dad8e402aaa2e8f"/><file name="mysql4-upgrade-1.1.1-1.1.2.php" hash="d35fc88aa22fa0272f4e44f65c684a14"/><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="c0ec21ffb4d3a22339bb2875e4c9d5ad"/></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="108e5bf0476aa0145f258f8cea50d94b"/></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.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
  </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>