pitneybowes_gsp - Version 1.0.1

Version Notes

Patch release for Magento Connect.

1. Fixed a production issue when exportedFiles variable is null
2. Added City to the Pitney Bowes Hub address provided to store admin on order details
3. Update PB tracking URL to https://parceltracking.pb.com/app/#/dashboard/UPIDHERE
4. Fixed issue with international tracking url
5. Fixed a production issue when exportedFiles variable is null
6. Fixed issue with ASN request not sending correct commodity quantity.
7. Made the PGP extension not required for installation thru the Magento Connect process.

Download this release

Release Info

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


Code changes from version 1.0.0 to 1.0.1

Files changed (43) hide show
  1. app/code/local/Pb/Pbgsp/Block/Adminhtml/Sales/Order/Invoice/Totals.php +3 -2
  2. app/code/local/Pb/Pbgsp/Block/Adminhtml/Sales/Order/Totals.php +3 -2
  3. app/code/local/Pb/Pbgsp/Block/Checkout/Shipping/Method/Available.php +3 -2
  4. app/code/local/Pb/Pbgsp/Block/Form.php +3 -2
  5. app/code/local/Pb/Pbgsp/Block/Sales/Order/Invoice/Totals.php +3 -2
  6. app/code/local/Pb/Pbgsp/Block/Sales/Order/Totals.php +3 -2
  7. app/code/local/Pb/Pbgsp/Model/Api.php +19 -12
  8. app/code/local/Pb/Pbgsp/Model/Carrier/ShippingMethod.php +3 -2
  9. app/code/local/Pb/Pbgsp/Model/Catalog/Category.php +3 -2
  10. app/code/local/Pb/Pbgsp/Model/Catalog/Cron.php +3 -2
  11. app/code/local/Pb/Pbgsp/Model/Catalog/File.php +66 -52
  12. app/code/local/Pb/Pbgsp/Model/Catalog/Product.php +3 -2
  13. app/code/local/Pb/Pbgsp/Model/Credentials.php +25 -2
  14. app/code/local/Pb/Pbgsp/Model/Creditmemo/Duty.php +3 -2
  15. app/code/local/Pb/Pbgsp/Model/Handlingoptions.php +3 -2
  16. app/code/local/Pb/Pbgsp/Model/Helper.php +3 -2
  17. app/code/local/Pb/Pbgsp/Model/Inboundparcel.php +3 -2
  18. app/code/local/Pb/Pbgsp/Model/Invoice/Duty.php +3 -2
  19. app/code/local/Pb/Pbgsp/Model/Messages.php +3 -2
  20. app/code/local/Pb/Pbgsp/Model/Mysql4/Inboundparcel.php +3 -2
  21. app/code/local/Pb/Pbgsp/Model/Mysql4/Inboundparcel/Collection.php +3 -2
  22. app/code/local/Pb/Pbgsp/Model/Mysql4/Ordernumber.php +3 -2
  23. app/code/local/Pb/Pbgsp/Model/Mysql4/Ordernumber/Collection.php +3 -2
  24. app/code/local/Pb/Pbgsp/Model/Mysql4/Variable.php +3 -2
  25. app/code/local/Pb/Pbgsp/Model/Mysql4/Variable/Collection.php +3 -2
  26. app/code/local/Pb/Pbgsp/Model/Observer.php +9 -4
  27. app/code/local/Pb/Pbgsp/Model/Ordernumber.php +3 -2
  28. app/code/local/Pb/Pbgsp/Model/Pdf/Tax.php +3 -2
  29. app/code/local/Pb/Pbgsp/Model/Quote/Duty.php +3 -2
  30. app/code/local/Pb/Pbgsp/Model/Resource/Mysql4/Setup.php +3 -2
  31. app/code/local/Pb/Pbgsp/Model/Sales/Order/Shipment.php +3 -2
  32. app/code/local/Pb/Pbgsp/Model/Util.php +3 -2
  33. app/code/local/Pb/Pbgsp/Model/Variable.php +3 -2
  34. app/code/local/Pb/Pbgsp/README +2 -2
  35. app/code/local/Pb/Pbgsp/data/pb_pbgsp_setup/data-install-1.0.0.php +20 -19
  36. app/code/local/Pb/Pbgsp/etc/config.xml +3 -1
  37. app/code/local/Pb/Pbgsp/etc/system.xml +64 -1
  38. app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php +3 -4
  39. app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.0.0-1.0.1.php +26 -0
  40. app/etc/modules/Pb_Pbgsp.xml +12 -12
  41. app/locale/en_US/Pb_Clearpath.csv +4 -0
  42. app/locale/en_US/template/email/pbgsp_shipment_new.html +12 -0
  43. package.xml +14 -6
app/code/local/Pb/Pbgsp/Block/Adminhtml/Sales/Order/Invoice/Totals.php CHANGED
@@ -1,9 +1,10 @@
1
  <?php
2
 
3
  /**
4
- * Product: Pb_Pbgsp (1.0.0)
5
- * Packaged: 2015-06-04T15:09:31+00:00
6
  * Last Modified: 2015-06-04T15:00:31+00:00
 
7
  * File: app/code/local/Pb/Pbgsp/Block/Adminhtml/Sales/Order/Invoice/Totals.php
8
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
9
  */
1
  <?php
2
 
3
  /**
4
+ * Product: Pb_Pbgsp (1.0.1)
5
+ * Packaged: 2015-09-21T15:12:31+00:00
6
  * Last Modified: 2015-06-04T15:00:31+00:00
7
+
8
  * File: app/code/local/Pb/Pbgsp/Block/Adminhtml/Sales/Order/Invoice/Totals.php
9
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
10
  */
app/code/local/Pb/Pbgsp/Block/Adminhtml/Sales/Order/Totals.php CHANGED
@@ -1,9 +1,10 @@
1
  <?php
2
 
3
  /**
4
- * Product: Pb_Pbgsp (1.0.0)
5
- * Packaged: 2015-06-04T15:09:31+00:00
6
  * Last Modified: 2015-06-04T15:00:31+00:00
 
7
  * File: app/code/local/Pb/Pbgsp/Block/Adminhtml/Sales/Order/Totals.php
8
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
9
  */
1
  <?php
2
 
3
  /**
4
+ * Product: Pb_Pbgsp (1.0.1)
5
+ * Packaged: 2015-09-21T15:12:31+00:00
6
  * Last Modified: 2015-06-04T15:00:31+00:00
7
+
8
  * File: app/code/local/Pb/Pbgsp/Block/Adminhtml/Sales/Order/Totals.php
9
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
10
  */
app/code/local/Pb/Pbgsp/Block/Checkout/Shipping/Method/Available.php CHANGED
@@ -1,9 +1,10 @@
1
  <?php
2
 
3
  /**
4
- * Product: Pb_Pbgsp (1.0.0)
5
- * Packaged: 2015-06-04T15:09:31+00:00
6
  * Last Modified: 2015-06-04T15:00:31+00:00
 
7
  * File: app/code/local/Pb/Pbgsp/Block/Checkout/Shipping/Method/Available.php
8
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
9
  */
1
  <?php
2
 
3
  /**
4
+ * Product: Pb_Pbgsp (1.0.1)
5
+ * Packaged: 2015-09-21T15:12:31+00:00
6
  * Last Modified: 2015-06-04T15:00:31+00:00
7
+
8
  * File: app/code/local/Pb/Pbgsp/Block/Checkout/Shipping/Method/Available.php
9
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
10
  */
app/code/local/Pb/Pbgsp/Block/Form.php CHANGED
@@ -1,8 +1,9 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.0.0)
4
- * Packaged: 2015-06-04T15:09:31+00:00
5
  * Last Modified: 2015-06-04T15:00:31+00:00
 
6
  * File: app/code/local/Pb/Pbgsp/Block/Form.php
7
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.0.1)
4
+ * Packaged: 2015-09-21T15:12:31+00:00
5
  * Last Modified: 2015-06-04T15:00:31+00:00
6
+
7
  * File: app/code/local/Pb/Pbgsp/Block/Form.php
8
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
9
  */
app/code/local/Pb/Pbgsp/Block/Sales/Order/Invoice/Totals.php CHANGED
@@ -1,9 +1,10 @@
1
  <?php
2
 
3
  /**
4
- * Product: Pb_Pbgsp (1.0.0)
5
- * Packaged: 2015-06-04T15:09:31+00:00
6
  * Last Modified: 2015-06-04T15:00:31+00:00
 
7
  * File: app/code/local/Pb/Pbgsp/Block/Sales/Order/Invoice/Totals.php
8
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
9
  */
1
  <?php
2
 
3
  /**
4
+ * Product: Pb_Pbgsp (1.0.1)
5
+ * Packaged: 2015-09-21T15:12:31+00:00
6
  * Last Modified: 2015-06-04T15:00:31+00:00
7
+
8
  * File: app/code/local/Pb/Pbgsp/Block/Sales/Order/Invoice/Totals.php
9
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
10
  */
app/code/local/Pb/Pbgsp/Block/Sales/Order/Totals.php CHANGED
@@ -1,8 +1,9 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.0.0)
4
- * Packaged: 2015-06-04T15:09:31+00:00
5
  * Last Modified: 2015-06-04T15:00:31+00:00
 
6
  * File: app/code/local/Pb/Pbgsp/Block/Sales/Order/Totals.php
7
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.0.1)
4
+ * Packaged: 2015-09-21T15:12:31+00:00
5
  * Last Modified: 2015-06-04T15:00:31+00:00
6
+
7
  * File: app/code/local/Pb/Pbgsp/Block/Sales/Order/Totals.php
8
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
9
  */
app/code/local/Pb/Pbgsp/Model/Api.php CHANGED
@@ -1,8 +1,9 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.0.0)
4
- * Packaged: 2015-06-04T15:09:31+00:00
5
  * Last Modified: 2015-06-04T15:00:31+00:00
 
6
  * File: app/code/local/Pb/Pbgsp/Model/Api.php
7
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
@@ -55,6 +56,7 @@ class Pb_Pbgsp_Model_Api
55
  curl_setopt($curl, CURLOPT_HTTPHEADER, $headers );
56
  curl_setopt($curl, CURLOPT_VERBOSE, 1); // turn verbose on
57
  curl_setopt($curl, CURLINFO_HEADER_OUT, true);
 
58
  $result = curl_exec($curl);
59
  $info = curl_getinfo($curl);
60
  //Pb_Pbgsp_Model_Util::log($info);
@@ -247,11 +249,16 @@ class Pb_Pbgsp_Model_Api
247
 
248
  }
249
 
250
- public static function generateInboundParcelNumber($shipment,$items,$mageOrderNumber,$cpOrderNumber) {
251
  $inboundParcelCommodities = array();
252
  /* @var Mage_Sales_Model_Order_Shipment $shipment*/
 
 
253
  $totalWeight = 0;
254
  foreach($shipment->getItemsCollection() as $item) {
 
 
 
255
  $product = Mage::getModel('catalog/product')->loadByAttribute('sku',$item->getSku());
256
  $commodity = array(
257
  'merchantComRefId' => $item->getSku(),
@@ -289,19 +296,19 @@ class Pb_Pbgsp_Model_Api
289
  ),
290
  'returnDetails' => array(
291
  'returnAddress' => array(
292
- 'street1' => '200 Main Street',
293
- 'city' => 'PHOENIX',
294
- 'provinceOrState' => 'AZ',
295
- 'country' => 'US',
296
- 'postalOrZipCode' => '85123'
297
  ),
298
  'contactInformation' => array(
299
- 'familyName' => 'Smith',
300
- 'givenName' => 'Mary',
301
- 'email' => 'retailer_email@test.com',
302
  'phoneNumbers' => array(
303
  array(
304
- 'number' => '12123232',
305
  'type' => 'home'
306
  )
307
  )
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.0.1)
4
+ * Packaged: 2015-09-21T15:12:31+00:00
5
  * Last Modified: 2015-06-04T15:00:31+00:00
6
+
7
  * File: app/code/local/Pb/Pbgsp/Model/Api.php
8
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
9
  */
56
  curl_setopt($curl, CURLOPT_HTTPHEADER, $headers );
57
  curl_setopt($curl, CURLOPT_VERBOSE, 1); // turn verbose on
58
  curl_setopt($curl, CURLINFO_HEADER_OUT, true);
59
+ //curl_setopt($curl, CURLOPT_SSL_CIPHER_LIST, 'TLSv1');
60
  $result = curl_exec($curl);
61
  $info = curl_getinfo($curl);
62
  //Pb_Pbgsp_Model_Util::log($info);
249
 
250
  }
251
 
252
+ public static function generateInboundParcelNumber($shipment,$items,$order,$cpOrderNumber) {
253
  $inboundParcelCommodities = array();
254
  /* @var Mage_Sales_Model_Order_Shipment $shipment*/
255
+ /* @var Mage_Sales_Model_Order $order */
256
+ $address = $order->getShippingAddress();
257
  $totalWeight = 0;
258
  foreach($shipment->getItemsCollection() as $item) {
259
+ $qty = intval($item->getQty());
260
+ if($qty ==0)
261
+ continue;
262
  $product = Mage::getModel('catalog/product')->loadByAttribute('sku',$item->getSku());
263
  $commodity = array(
264
  'merchantComRefId' => $item->getSku(),
296
  ),
297
  'returnDetails' => array(
298
  'returnAddress' => array(
299
+ 'street1' => Pb_Pbgsp_Model_Credentials::getReturnAddressStreet1(),
300
+ 'city' => Pb_Pbgsp_Model_Credentials::getReturnAddressCity(),
301
+ 'provinceOrState' => Pb_Pbgsp_Model_Credentials::getReturnAddressState(),
302
+ 'country' => Pb_Pbgsp_Model_Credentials::getReturnAddressCountry(),
303
+ 'postalOrZipCode' => Pb_Pbgsp_Model_Credentials::getReturnAddressZip()
304
  ),
305
  'contactInformation' => array(
306
+ 'familyName' => $address->getLastname(),
307
+ 'givenName' => $address->getFirstname(),
308
+ 'email' => $address->getEmail(),
309
  'phoneNumbers' => array(
310
  array(
311
+ 'number' => $address->getTelephone(),
312
  'type' => 'home'
313
  )
314
  )
app/code/local/Pb/Pbgsp/Model/Carrier/ShippingMethod.php CHANGED
@@ -1,9 +1,10 @@
1
  <?php
2
 
3
  /**
4
- * Product: Pb_Pbgsp (1.0.0)
5
- * Packaged: 2015-06-04T15:09:31+00:00
6
  * Last Modified: 2015-06-04T15:00:31+00:00
 
7
  * File: app/code/local/Pb/Pbgsp/Model/Carrier/ShippingMethod.php
8
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
9
  */
1
  <?php
2
 
3
  /**
4
+ * Product: Pb_Pbgsp (1.0.1)
5
+ * Packaged: 2015-09-21T15:12:31+00:00
6
  * Last Modified: 2015-06-04T15:00:31+00:00
7
+
8
  * File: app/code/local/Pb/Pbgsp/Model/Carrier/ShippingMethod.php
9
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
10
  */
app/code/local/Pb/Pbgsp/Model/Catalog/Category.php CHANGED
@@ -1,8 +1,9 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.0.0)
4
- * Packaged: 2015-06-04T15:09:31+00:00
5
  * Last Modified: 2015-06-04T15:00:31+00:00
 
6
  * File: app/code/local/Pb/Pbgsp/Model/Catalog/Category.php
7
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.0.1)
4
+ * Packaged: 2015-09-21T15:12:31+00:00
5
  * Last Modified: 2015-06-04T15:00:31+00:00
6
+
7
  * File: app/code/local/Pb/Pbgsp/Model/Catalog/Category.php
8
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
9
  */
app/code/local/Pb/Pbgsp/Model/Catalog/Cron.php CHANGED
@@ -1,8 +1,9 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.0.0)
4
- * Packaged: 2015-06-04T15:09:31+00:00
5
  * Last Modified: 2015-06-04T15:00:31+00:00
 
6
  * File: app/code/local/Pb/Pbgsp/Model/Catalog/Cron.php
7
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.0.1)
4
+ * Packaged: 2015-09-21T15:12:31+00:00
5
  * Last Modified: 2015-06-04T15:00:31+00:00
6
+
7
  * File: app/code/local/Pb/Pbgsp/Model/Catalog/Cron.php
8
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
9
  */
app/code/local/Pb/Pbgsp/Model/Catalog/File.php CHANGED
@@ -2,8 +2,8 @@
2
 
3
  /**
4
  * Product: Pb_Pbgsp (1.0.0)
5
- * Packaged: 2015-06-04T15:09:31+00:00
6
- * Last Modified: 2015-06-04T15:00:31+00:00
7
  * File: app/code/local/Pb/Pbgsp/Model/Catalog/File.php
8
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
9
  */
@@ -204,8 +204,8 @@ class Pb_Pbgsp_Model_Catalog_File {
204
  ->addAttributeToSelect('product_url')
205
  ->addAttributeToSelect('type_id')
206
  ->addAttributeToSelect('pb_pbgsp_upload')
207
- // ->addUrlRewrite($category->getId()) //this will add the url rewrite.
208
- ->addAttributeToSelect('price')
209
  ->addAttributeToSelect('weight');
210
 
211
  $baseURL = Mage::app()->getStore($category->getStoreId())->getBaseUrl();
@@ -292,7 +292,7 @@ class Pb_Pbgsp_Model_Catalog_File {
292
  }
293
  }
294
  }
295
- // Pb_Pbgsp_Model_Util::log($names);
296
  return implode('|',$names);
297
  }
298
 
@@ -383,43 +383,56 @@ class Pb_Pbgsp_Model_Catalog_File {
383
  public function processStatusNotifications() {
384
  try {
385
 
386
- $adminEmail = Pb_Pbgsp_Model_Credentials::getAdminEmail();
387
  if(!isset($adminEmail) || $adminEmail=='')
388
  return;
389
- $notificationDir = $this->_getNotificationDir();
390
- $this->_downloadStatusNotifications($notificationDir);
391
- $notificationFiles = array_diff(scandir($notificationDir), array('..', '.'));
392
- if(count($notificationFiles) > 0) {
393
- $mail = new Zend_Mail();
394
- $mail->setFrom('no-reply@pb.com','Pitney Bowes');
395
- $mail->addTo($adminEmail)
396
- ->setSubject('Catalog Export Error')
397
- ->setBodyText('Catalog Export Error. Please see attached files.');
398
- $fileCount = 0;
399
- foreach($notificationFiles as $notificationFile) {
400
- if($this->_endsWith($notificationFile,'.err') || $this->_endsWith($notificationFile,'.log') ) {
401
- $file = $notificationDir.'/'. $notificationFile;
402
- $at = new Zend_Mime_Part(file_get_contents($file));
403
- $at->filename = basename($file);
404
- $at->disposition = Zend_Mime::DISPOSITION_ATTACHMENT;
405
- $at->encoding = Zend_Mime::ENCODING_8BIT;
406
-
407
- $mail->addAttachment($at);
408
- $fileCount++;
409
- }
410
 
411
- }
412
- if($fileCount > 0) {
413
- $mail->send();
414
- Pb_Pbgsp_Model_Util::log("Email sent with error files.");
415
- }
 
 
 
 
 
 
 
 
 
 
416
 
417
- else {
418
- Pb_Pbgsp_Model_Util::log(" No error files found.");
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
419
  }
420
- //keep these files until next upload and delete files from old upload
421
- $this->_cleanNotificationFiles();
422
- }
423
  }
424
  catch (Exception $e) {
425
  Pb_Pbgsp_Model_Util::log("Error in processStatusNotifications:". $e->getMessage());
@@ -543,6 +556,7 @@ class Pb_Pbgsp_Model_Catalog_File {
543
  $exportedFiles = array_diff(scandir($tmpDir), array('..', '.'));
544
  if (count($this->productIds) == 0) {
545
  // No new products to send, don't send anything.
 
546
  $this->_removeExportedFiles($exportedFiles);
547
 
548
  return;
@@ -557,7 +571,7 @@ class Pb_Pbgsp_Model_Catalog_File {
557
  else {
558
  Pb_Pbgsp_Model_Util::log('Encryption is not enabled.'.Pb_Pbgsp_Model_Credentials::isEncryptionEnabled());
559
  }
560
- $sftpDumpFile = new Varien_Io_Sftp();
561
  $credentials = $this->_getSftpCredentials();
562
 
563
  Pb_Pbgsp_Model_Util::log($credentials);
@@ -572,19 +586,19 @@ class Pb_Pbgsp_Model_Catalog_File {
572
  $tmpSFTPDir = $rootDir.'tmp';
573
  $inboundDir = $rootDir.'inbound';
574
  $uploadedFiles = array();
575
- foreach($exportedFiles as $exportedFile) {
576
- $fileName = $tmpDir . $exportedFile;
577
- if(is_dir($fileName))
578
- continue;
579
 
580
- Pb_Pbgsp_Model_Util::log("CD to $tmpSFTPDir");
581
- $sftpDumpFile->cd($tmpSFTPDir);
582
- Pb_Pbgsp_Model_Util::log("Uploading $fileName");
583
- $sftpDumpFile->write($exportedFile, file_get_contents($fileName));
584
- Pb_Pbgsp_Model_Util::log("Moving ".$tmpSFTPDir."/$exportedFile"." to ".$inboundDir."/$exportedFile");
585
- $sftpDumpFile->mv($tmpSFTPDir."/$exportedFile",$inboundDir."/$exportedFile");
586
- $uploadedFiles[] = $exportedFile;
587
- }
588
  $sftpDumpFile->close();
589
 
590
  } catch (Exception $e) {
@@ -616,7 +630,7 @@ class Pb_Pbgsp_Model_Catalog_File {
616
  }
617
  private function _getLastExportedFileNames() {
618
  $exportedFilesVariable = $this->_getExportedFilesVariable();
619
- if(!isset($exportedFilesVariable) && $exportedFilesVariable->getValue() != '')
620
  return false;
621
  $exportedFiles = explode('|',$exportedFilesVariable->getValue());
622
  return $exportedFiles;
@@ -667,7 +681,7 @@ class Pb_Pbgsp_Model_Catalog_File {
667
  {
668
  if ($product->shouldUpload($this->lastDiff)) {
669
  array_push($this->productIds,$product->getMageProduct()->getId());
670
- // Pb_Pbgsp_Model_Util::log("Product SKU:" . $product->getSKU());
671
  $product->writeToFile($this->file,$categoryCode,$parentSku,$category);
672
  fflush($this->file);
673
  }
2
 
3
  /**
4
  * Product: Pb_Pbgsp (1.0.0)
5
+ * Packaged: 2015-05-06T18:09:31+00:00
6
+ * Last Modified: 2015-05-06T18:09:31+00:00
7
  * File: app/code/local/Pb/Pbgsp/Model/Catalog/File.php
8
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
9
  */
204
  ->addAttributeToSelect('product_url')
205
  ->addAttributeToSelect('type_id')
206
  ->addAttributeToSelect('pb_pbgsp_upload')
207
+ // ->addUrlRewrite($category->getId()) //this will add the url rewrite.
208
+ ->addAttributeToSelect('price')
209
  ->addAttributeToSelect('weight');
210
 
211
  $baseURL = Mage::app()->getStore($category->getStoreId())->getBaseUrl();
292
  }
293
  }
294
  }
295
+ // Pb_Pbgsp_Model_Util::log($names);
296
  return implode('|',$names);
297
  }
298
 
383
  public function processStatusNotifications() {
384
  try {
385
 
386
+ $adminEmail = Pb_Pbgsp_Model_Credentials::getAdminEmail();
387
  if(!isset($adminEmail) || $adminEmail=='')
388
  return;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
389
 
390
+ $notificationDir = $this->_getNotificationDir();
391
+ $this->_downloadStatusNotifications($notificationDir);
392
+ $notificationFiles = array_diff(scandir($notificationDir), array('..', '.'));
393
+ if(count($notificationFiles) > 0) {
394
+ $mail = new Zend_Mail();
395
+ $mail->setFrom('no-reply@pb.com','Pitney Bowes');
396
+ $mail->addTo($adminEmail)
397
+ ->setSubject('Catalog Export Error')
398
+ ->setBodyText('Catalog Export Error. Please see attached files.');
399
+ $fileCount = 0;
400
+ foreach($notificationFiles as $notificationFile) {
401
+ $attachFile = false;
402
+ if($this->_endsWith($notificationFile,'.err') || $this->_endsWith($notificationFile,'.log') ) {
403
+ if(Pb_Pbgsp_Model_Credentials::isCatalogErrorNotificationEnabled())
404
+ $attachFile = true;
405
 
406
+ }
407
+ else if($this->_endsWith($notificationFile,'.ok')) {
408
+ if(Pb_Pbgsp_Model_Credentials::isCatalogSuccessNotificationEnabled()) {
409
+ $attachFile = true;
410
+ $mail->setSubject('Catalog Export Successful');
411
+ }
412
+
413
+ }
414
+ if($attachFile) {
415
+ $file = $notificationDir.'/'. $notificationFile;
416
+ $at = new Zend_Mime_Part(file_get_contents($file));
417
+ $at->filename = basename($file);
418
+ $at->disposition = Zend_Mime::DISPOSITION_ATTACHMENT;
419
+ $at->encoding = Zend_Mime::ENCODING_8BIT;
420
+
421
+ $mail->addAttachment($at);
422
+ $fileCount++;
423
+ }
424
+ }
425
+ if($fileCount > 0) {
426
+ $mail->send();
427
+ Pb_Pbgsp_Model_Util::log("Email sent with error or success files.");
428
+ }
429
+
430
+ else {
431
+ Pb_Pbgsp_Model_Util::log(" No error files found.");
432
+ }
433
+ //keep these files until next upload and delete files from old upload
434
+ $this->_cleanNotificationFiles();
435
  }
 
 
 
436
  }
437
  catch (Exception $e) {
438
  Pb_Pbgsp_Model_Util::log("Error in processStatusNotifications:". $e->getMessage());
556
  $exportedFiles = array_diff(scandir($tmpDir), array('..', '.'));
557
  if (count($this->productIds) == 0) {
558
  // No new products to send, don't send anything.
559
+ Pb_Pbgsp_Model_Util::log("No new products to send, don't send anything.");
560
  $this->_removeExportedFiles($exportedFiles);
561
 
562
  return;
571
  else {
572
  Pb_Pbgsp_Model_Util::log('Encryption is not enabled.'.Pb_Pbgsp_Model_Credentials::isEncryptionEnabled());
573
  }
574
+ $sftpDumpFile = new Varien_Io_Sftp();
575
  $credentials = $this->_getSftpCredentials();
576
 
577
  Pb_Pbgsp_Model_Util::log($credentials);
586
  $tmpSFTPDir = $rootDir.'tmp';
587
  $inboundDir = $rootDir.'inbound';
588
  $uploadedFiles = array();
589
+ foreach($exportedFiles as $exportedFile) {
590
+ $fileName = $tmpDir . $exportedFile;
591
+ if(is_dir($fileName))
592
+ continue;
593
 
594
+ Pb_Pbgsp_Model_Util::log("CD to $tmpSFTPDir");
595
+ $sftpDumpFile->cd($tmpSFTPDir);
596
+ Pb_Pbgsp_Model_Util::log("Uploading $fileName");
597
+ $sftpDumpFile->write($exportedFile, file_get_contents($fileName));
598
+ Pb_Pbgsp_Model_Util::log("Moving ".$tmpSFTPDir."/$exportedFile"." to ".$inboundDir."/$exportedFile");
599
+ $sftpDumpFile->mv($tmpSFTPDir."/$exportedFile",$inboundDir."/$exportedFile");
600
+ $uploadedFiles[] = $exportedFile;
601
+ }
602
  $sftpDumpFile->close();
603
 
604
  } catch (Exception $e) {
630
  }
631
  private function _getLastExportedFileNames() {
632
  $exportedFilesVariable = $this->_getExportedFilesVariable();
633
+ if(!isset($exportedFilesVariable) || $exportedFilesVariable->getValue() != '')
634
  return false;
635
  $exportedFiles = explode('|',$exportedFilesVariable->getValue());
636
  return $exportedFiles;
681
  {
682
  if ($product->shouldUpload($this->lastDiff)) {
683
  array_push($this->productIds,$product->getMageProduct()->getId());
684
+ // Pb_Pbgsp_Model_Util::log("Product SKU:" . $product->getSKU());
685
  $product->writeToFile($this->file,$categoryCode,$parentSku,$category);
686
  fflush($this->file);
687
  }
app/code/local/Pb/Pbgsp/Model/Catalog/Product.php CHANGED
@@ -1,8 +1,9 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.0.0)
4
- * Packaged: 2015-06-04T15:09:31+00:00
5
  * Last Modified: 2015-06-04T15:00:31+00:00
 
6
  * File: app/code/local/Pb/Pbgsp/Model/Catalog/Product.php
7
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.0.1)
4
+ * Packaged: 2015-09-21T15:12:31+00:00
5
  * Last Modified: 2015-06-04T15:00:31+00:00
6
+
7
  * File: app/code/local/Pb/Pbgsp/Model/Catalog/Product.php
8
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
9
  */
app/code/local/Pb/Pbgsp/Model/Credentials.php CHANGED
@@ -1,8 +1,9 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.0.0)
4
- * Packaged: 2015-06-04T15:09:31+00:00
5
  * Last Modified: 2015-06-04T15:00:31+00:00
 
6
  * File: app/code/local/Pb/Pbgsp/Model/Credentials.php
7
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
@@ -51,6 +52,12 @@ class Pb_Pbgsp_Model_Credentials {
51
  public static function isFreeTaxEnabled() {
52
  return Mage::getStoreConfig('carriers/pbgsp/free_tax_enable');
53
  }
 
 
 
 
 
 
54
  public static function getHandlingFee() {
55
 
56
  return self::_getFloatValue(Mage::getStoreConfig('carriers/pbgsp/handlingfee'));
@@ -124,5 +131,21 @@ class Pb_Pbgsp_Model_Credentials {
124
  public static function getPBID() {
125
  return "16061";
126
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
127
  }
128
  ?>
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.0.1)
4
+ * Packaged: 2015-09-21T15:12:31+00:00
5
  * Last Modified: 2015-06-04T15:00:31+00:00
6
+
7
  * File: app/code/local/Pb/Pbgsp/Model/Credentials.php
8
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
9
  */
52
  public static function isFreeTaxEnabled() {
53
  return Mage::getStoreConfig('carriers/pbgsp/free_tax_enable');
54
  }
55
+ public static function isCatalogSuccessNotificationEnabled() {
56
+ return Mage::getStoreConfig('carriers/pbgsp/notify_catalog_ok');
57
+ }
58
+ public static function isCatalogErrorNotificationEnabled() {
59
+ return Mage::getStoreConfig('carriers/pbgsp/notify_catalog_err');
60
+ }
61
  public static function getHandlingFee() {
62
 
63
  return self::_getFloatValue(Mage::getStoreConfig('carriers/pbgsp/handlingfee'));
131
  public static function getPBID() {
132
  return "16061";
133
  }
134
+
135
+ public static function getReturnAddressStreet1() {
136
+ return Mage::getStoreConfig('carriers/pbgsp/return_address_street1');
137
+ }
138
+ public static function getReturnAddressCity() {
139
+ return Mage::getStoreConfig('carriers/pbgsp/return_address_city');
140
+ }
141
+ public static function getReturnAddressState() {
142
+ return Mage::getStoreConfig('carriers/pbgsp/return_address_state');
143
+ }
144
+ public static function getReturnAddressCountry() {
145
+ return Mage::getStoreConfig('carriers/pbgsp/return_address_country');
146
+ }
147
+ public static function getReturnAddressZip() {
148
+ return Mage::getStoreConfig('carriers/pbgsp/return_address_zip');
149
+ }
150
  }
151
  ?>
app/code/local/Pb/Pbgsp/Model/Creditmemo/Duty.php CHANGED
@@ -1,8 +1,9 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.0.0)
4
- * Packaged: 2015-06-04T15:09:31+00:00
5
  * Last Modified: 2015-06-04T15:00:31+00:00
 
6
  * File: app/code/local/Pb/Pbgsp/Model/Creditmemo/Duty.php
7
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.0.1)
4
+ * Packaged: 2015-09-21T15:12:31+00:00
5
  * Last Modified: 2015-06-04T15:00:31+00:00
6
+
7
  * File: app/code/local/Pb/Pbgsp/Model/Creditmemo/Duty.php
8
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
9
  */
app/code/local/Pb/Pbgsp/Model/Handlingoptions.php CHANGED
@@ -1,8 +1,9 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.0.0)
4
- * Packaged: 2015-06-04T15:09:31+00:00
5
  * Last Modified: 2015-06-04T15:00:31+00:00
 
6
  * File: app/code/local/Pb/Pbgsp/Model/Handlingoptions.php
7
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.0.1)
4
+ * Packaged: 2015-09-21T15:12:31+00:00
5
  * Last Modified: 2015-06-04T15:00:31+00:00
6
+
7
  * File: app/code/local/Pb/Pbgsp/Model/Handlingoptions.php
8
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
9
  */
app/code/local/Pb/Pbgsp/Model/Helper.php CHANGED
@@ -1,8 +1,9 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.0.0)
4
- * Packaged: 2015-06-04T15:09:31+00:00
5
  * Last Modified: 2015-06-04T15:00:31+00:00
 
6
  * File: app/code/local/Pb/Pbgsp/Model/Helper.php
7
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.0.1)
4
+ * Packaged: 2015-09-21T15:12:31+00:00
5
  * Last Modified: 2015-06-04T15:00:31+00:00
6
+
7
  * File: app/code/local/Pb/Pbgsp/Model/Helper.php
8
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
9
  */
app/code/local/Pb/Pbgsp/Model/Inboundparcel.php CHANGED
@@ -1,8 +1,9 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.0.0)
4
- * Packaged: 2015-06-04T15:09:31+00:00
5
  * Last Modified: 2015-06-04T15:00:31+00:00
 
6
  * File: app/code/local/Pb/Pbgsp/Model/Inboundparcel.php
7
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.0.1)
4
+ * Packaged: 2015-09-21T15:12:31+00:00
5
  * Last Modified: 2015-06-04T15:00:31+00:00
6
+
7
  * File: app/code/local/Pb/Pbgsp/Model/Inboundparcel.php
8
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
9
  */
app/code/local/Pb/Pbgsp/Model/Invoice/Duty.php CHANGED
@@ -1,8 +1,9 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.0.0)
4
- * Packaged: 2015-06-04T15:09:31+00:00
5
  * Last Modified: 2015-06-04T15:00:31+00:00
 
6
  * File: app/code/local/Pb/Pbgsp/Model/Invoice/Duty.php
7
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.0.1)
4
+ * Packaged: 2015-09-21T15:12:31+00:00
5
  * Last Modified: 2015-06-04T15:00:31+00:00
6
+
7
  * File: app/code/local/Pb/Pbgsp/Model/Invoice/Duty.php
8
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
9
  */
app/code/local/Pb/Pbgsp/Model/Messages.php CHANGED
@@ -1,8 +1,9 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.0.0)
4
- * Packaged: 2015-06-04T15:09:31+00:00
5
  * Last Modified: 2015-06-04T15:00:31+00:00
 
6
  * File: app/code/local/Pb/Pbgsp/Model/Messages.php
7
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.0.1)
4
+ * Packaged: 2015-09-21T15:12:31+00:00
5
  * Last Modified: 2015-06-04T15:00:31+00:00
6
+
7
  * File: app/code/local/Pb/Pbgsp/Model/Messages.php
8
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
9
  */
app/code/local/Pb/Pbgsp/Model/Mysql4/Inboundparcel.php CHANGED
@@ -1,8 +1,9 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.0.0)
4
- * Packaged: 2015-06-04T15:09:31+00:00
5
  * Last Modified: 2015-06-04T15:00:31+00:00
 
6
  * File: app/code/local/Pb/Pbgsp/Model/Mysql4/Inboundparcel.php
7
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.0.1)
4
+ * Packaged: 2015-09-21T15:12:31+00:00
5
  * Last Modified: 2015-06-04T15:00:31+00:00
6
+
7
  * File: app/code/local/Pb/Pbgsp/Model/Mysql4/Inboundparcel.php
8
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
9
  */
app/code/local/Pb/Pbgsp/Model/Mysql4/Inboundparcel/Collection.php CHANGED
@@ -1,8 +1,9 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.0.0)
4
- * Packaged: 2015-06-04T15:09:31+00:00
5
  * Last Modified: 2015-06-04T15:00:31+00:00
 
6
  * File: app/code/local/Pb/Pbgsp/Model/Mysql4/Inboundparcel/Collection.php
7
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.0.1)
4
+ * Packaged: 2015-09-21T15:12:31+00:00
5
  * Last Modified: 2015-06-04T15:00:31+00:00
6
+
7
  * File: app/code/local/Pb/Pbgsp/Model/Mysql4/Inboundparcel/Collection.php
8
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
9
  */
app/code/local/Pb/Pbgsp/Model/Mysql4/Ordernumber.php CHANGED
@@ -1,8 +1,9 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.0.0)
4
- * Packaged: 2015-06-04T15:09:31+00:00
5
  * Last Modified: 2015-06-04T15:00:31+00:00
 
6
  * File: app/code/local/Pb/Pbgsp/Model/Mysql4/Ordernumber.php
7
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.0.1)
4
+ * Packaged: 2015-09-21T15:12:31+00:00
5
  * Last Modified: 2015-06-04T15:00:31+00:00
6
+
7
  * File: app/code/local/Pb/Pbgsp/Model/Mysql4/Ordernumber.php
8
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
9
  */
app/code/local/Pb/Pbgsp/Model/Mysql4/Ordernumber/Collection.php CHANGED
@@ -1,8 +1,9 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.0.0)
4
- * Packaged: 2015-06-04T15:09:31+00:00
5
  * Last Modified: 2015-06-04T15:00:31+00:00
 
6
  * File: app/code/local/Pb/Pbgsp/Model/Mysql4/Ordernumber/Collection.php
7
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.0.1)
4
+ * Packaged: 2015-09-21T15:12:31+00:00
5
  * Last Modified: 2015-06-04T15:00:31+00:00
6
+
7
  * File: app/code/local/Pb/Pbgsp/Model/Mysql4/Ordernumber/Collection.php
8
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
9
  */
app/code/local/Pb/Pbgsp/Model/Mysql4/Variable.php CHANGED
@@ -1,8 +1,9 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.0.0)
4
- * Packaged: 2015-06-04T15:09:31+00:00
5
  * Last Modified: 2015-06-04T15:00:31+00:00
 
6
  * File: app/code/local/Pb/Pbgsp/Model/Mysql4/Variable.php
7
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.0.1)
4
+ * Packaged: 2015-09-21T15:12:31+00:00
5
  * Last Modified: 2015-06-04T15:00:31+00:00
6
+
7
  * File: app/code/local/Pb/Pbgsp/Model/Mysql4/Variable.php
8
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
9
  */
app/code/local/Pb/Pbgsp/Model/Mysql4/Variable/Collection.php CHANGED
@@ -1,8 +1,9 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.0.0)
4
- * Packaged: 2015-06-04T15:09:31+00:00
5
  * Last Modified: 2015-06-04T15:00:31+00:00
 
6
  * File: app/code/local/Pb/Pbgsp/Model/Mysql4/Variable/Collection.php
7
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.0.1)
4
+ * Packaged: 2015-09-21T15:12:31+00:00
5
  * Last Modified: 2015-06-04T15:00:31+00:00
6
+
7
  * File: app/code/local/Pb/Pbgsp/Model/Mysql4/Variable/Collection.php
8
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
9
  */
app/code/local/Pb/Pbgsp/Model/Observer.php CHANGED
@@ -1,8 +1,9 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.0.0)
4
- * Packaged: 2015-06-04T15:09:31+00:00
5
  * Last Modified: 2015-06-04T15:00:31+00:00
 
6
  * File: app/code/local/Pb/Pbgsp/Model/Observer.php
7
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
@@ -70,7 +71,7 @@ class Pb_Pbgsp_Model_Observer {
70
 
71
  }
72
 
73
- $parcelResponse = Pb_Pbgsp_Model_Api::generateInboundParcelNumber($shipment,$items,$order -> getRealOrderId(),$cpOrderNumber);
74
  if(array_key_exists('errors',$parcelResponse)) {
75
  Pb_Pbgsp_Model_Util::log("Error generating inbound parcel");
76
  Pb_Pbgsp_Model_Util::log($parcelResponse);
@@ -155,10 +156,11 @@ class Pb_Pbgsp_Model_Observer {
155
  $orderNumber->setHubId($order["shipToHub"]['hubId']);
156
  $orderNumber->setHubStreet1($order["shipToHub"]['hubAddress']['street1']);
157
  $orderNumber->setHubStreet2($order["shipToHub"]['hubAddress']['street2']);
 
158
  $orderNumber->setHubProvinceOrState($order["shipToHub"]['hubAddress']['provinceOrState']);
159
  $orderNumber->setHubCountry($order["shipToHub"]['hubAddress']['country']);
160
  $orderNumber->setHubPostalCode($order["shipToHub"]['hubAddress']['postalOrZipCode']);
161
-
162
  Mage::getSingleton("customer/session")->setPbOrderNumber($orderNumber);
163
  } else {
164
  Pb_Pbgsp_Model_Util::log(" not clearpath order");
@@ -218,10 +220,13 @@ class Pb_Pbgsp_Model_Observer {
218
  <span>".$cpOrderNumber->getHubStreet1()."</span><br/>
219
  <strong>Hub Street 2</strong>
220
  <span>".$cpOrderNumber->getHubStreet2()."</span><br/>
 
221
  <strong>Postal Code</strong>
222
  <span>".$cpOrderNumber->getHubPostalCode()."</span><br/>
223
  <strong>Hub Province/State</strong>
224
  <span>".$cpOrderNumber->getHubProvinceOrState()."</span><br/>
 
 
225
  <strong>Hub Country</strong>
226
  <span>".$cpOrderNumber->getHubCountry()."</span><br/>
227
  </fieldset>
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.0.1)
4
+ * Packaged: 2015-09-21T15:12:31+00:00
5
  * Last Modified: 2015-06-04T15:00:31+00:00
6
+
7
  * File: app/code/local/Pb/Pbgsp/Model/Observer.php
8
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
9
  */
71
 
72
  }
73
 
74
+ $parcelResponse = Pb_Pbgsp_Model_Api::generateInboundParcelNumber($shipment,$items,$order,$cpOrderNumber);
75
  if(array_key_exists('errors',$parcelResponse)) {
76
  Pb_Pbgsp_Model_Util::log("Error generating inbound parcel");
77
  Pb_Pbgsp_Model_Util::log($parcelResponse);
156
  $orderNumber->setHubId($order["shipToHub"]['hubId']);
157
  $orderNumber->setHubStreet1($order["shipToHub"]['hubAddress']['street1']);
158
  $orderNumber->setHubStreet2($order["shipToHub"]['hubAddress']['street2']);
159
+
160
  $orderNumber->setHubProvinceOrState($order["shipToHub"]['hubAddress']['provinceOrState']);
161
  $orderNumber->setHubCountry($order["shipToHub"]['hubAddress']['country']);
162
  $orderNumber->setHubPostalCode($order["shipToHub"]['hubAddress']['postalOrZipCode']);
163
+ $orderNumber->setHubCity($order["shipToHub"]['hubAddress']['city']);
164
  Mage::getSingleton("customer/session")->setPbOrderNumber($orderNumber);
165
  } else {
166
  Pb_Pbgsp_Model_Util::log(" not clearpath order");
220
  <span>".$cpOrderNumber->getHubStreet1()."</span><br/>
221
  <strong>Hub Street 2</strong>
222
  <span>".$cpOrderNumber->getHubStreet2()."</span><br/>
223
+
224
  <strong>Postal Code</strong>
225
  <span>".$cpOrderNumber->getHubPostalCode()."</span><br/>
226
  <strong>Hub Province/State</strong>
227
  <span>".$cpOrderNumber->getHubProvinceOrState()."</span><br/>
228
+ <strong>Hub City</strong>
229
+ <span>".$cpOrderNumber->getHubCity()."</span><br/>
230
  <strong>Hub Country</strong>
231
  <span>".$cpOrderNumber->getHubCountry()."</span><br/>
232
  </fieldset>
app/code/local/Pb/Pbgsp/Model/Ordernumber.php CHANGED
@@ -1,8 +1,9 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.0.0)
4
- * Packaged: 2015-06-04T15:09:31+00:00
5
  * Last Modified: 2015-06-04T15:00:31+00:00
 
6
  * File: app/code/local/Pb/Pbgsp/Model/Ordernumber.php
7
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.0.1)
4
+ * Packaged: 2015-09-21T15:12:31+00:00
5
  * Last Modified: 2015-06-04T15:00:31+00:00
6
+
7
  * File: app/code/local/Pb/Pbgsp/Model/Ordernumber.php
8
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
9
  */
app/code/local/Pb/Pbgsp/Model/Pdf/Tax.php CHANGED
@@ -1,8 +1,9 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.0.0)
4
- * Packaged: 2015-06-04T15:09:31+00:00
5
  * Last Modified: 2015-06-04T15:00:31+00:00
 
6
  * File: app/code/local/Pb/Pbgsp/Model/Pdf/Tax.php
7
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.0.1)
4
+ * Packaged: 2015-09-21T15:12:31+00:00
5
  * Last Modified: 2015-06-04T15:00:31+00:00
6
+
7
  * File: app/code/local/Pb/Pbgsp/Model/Pdf/Tax.php
8
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
9
  */
app/code/local/Pb/Pbgsp/Model/Quote/Duty.php CHANGED
@@ -1,9 +1,10 @@
1
  <?php
2
 
3
  /**
4
- * Product: Pb_Pbgsp (1.0.0)
5
- * Packaged: 2015-06-04T15:09:31+00:00
6
  * Last Modified: 2015-06-04T15:00:31+00:00
 
7
  * File: app/code/local/Pb/Pbgsp/Model/Quote/Duty.php
8
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
9
  */
1
  <?php
2
 
3
  /**
4
+ * Product: Pb_Pbgsp (1.0.1)
5
+ * Packaged: 2015-09-21T15:12:31+00:00
6
  * Last Modified: 2015-06-04T15:00:31+00:00
7
+
8
  * File: app/code/local/Pb/Pbgsp/Model/Quote/Duty.php
9
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
10
  */
app/code/local/Pb/Pbgsp/Model/Resource/Mysql4/Setup.php CHANGED
@@ -1,8 +1,9 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.0.0)
4
- * Packaged: 2015-06-04T15:09:31+00:00
5
  * Last Modified: 2015-06-04T15:00:31+00:00
 
6
  * File: app/code/local/Pb/Pbgsp/Model/Resource/Mysql4/Setup.php
7
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.0.1)
4
+ * Packaged: 2015-09-21T15:12:31+00:00
5
  * Last Modified: 2015-06-04T15:00:31+00:00
6
+
7
  * File: app/code/local/Pb/Pbgsp/Model/Resource/Mysql4/Setup.php
8
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
9
  */
app/code/local/Pb/Pbgsp/Model/Sales/Order/Shipment.php CHANGED
@@ -1,8 +1,9 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.0.0)
4
- * Packaged: 2015-06-04T15:09:31+00:00
5
  * Last Modified: 2015-06-04T15:00:31+00:00
 
6
  * File: app/code/local/Pb/Pbgsp/Model/Sales/Order/Shipment.php
7
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.0.1)
4
+ * Packaged: 2015-09-21T15:12:31+00:00
5
  * Last Modified: 2015-06-04T15:00:31+00:00
6
+
7
  * File: app/code/local/Pb/Pbgsp/Model/Sales/Order/Shipment.php
8
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
9
  */
app/code/local/Pb/Pbgsp/Model/Util.php CHANGED
@@ -1,8 +1,9 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.0.0)
4
- * Packaged: 2015-06-04T15:09:31+00:00
5
  * Last Modified: 2015-06-04T15:00:31+00:00
 
6
  * File: app/code/local/Pb/Pbgsp/Model/Util.php
7
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.0.1)
4
+ * Packaged: 2015-09-21T15:12:31+00:00
5
  * Last Modified: 2015-06-04T15:00:31+00:00
6
+
7
  * File: app/code/local/Pb/Pbgsp/Model/Util.php
8
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
9
  */
app/code/local/Pb/Pbgsp/Model/Variable.php CHANGED
@@ -1,8 +1,9 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.0.0)
4
- * Packaged: 2015-06-04T15:09:31+00:00
5
  * Last Modified: 2015-06-04T15:00:31+00:00
 
6
  * File: app/code/local/Pb/Pbgsp/Model/Variable.php
7
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.0.1)
4
+ * Packaged: 2015-09-21T15:12:31+00:00
5
  * Last Modified: 2015-06-04T15:00:31+00:00
6
+
7
  * File: app/code/local/Pb/Pbgsp/Model/Variable.php
8
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
9
  */
app/code/local/Pb/Pbgsp/README CHANGED
@@ -1,2 +1,2 @@
1
- Dependencies:
2
- gnupg
1
+ Dependencies:
2
+ gnupg
app/code/local/Pb/Pbgsp/data/pb_pbgsp_setup/data-install-1.0.0.php CHANGED
@@ -1,19 +1,20 @@
1
- <?php
2
- /**
3
- * Product: Pb_Pbgsp (1.0.0)
4
- * Packaged: 2015-05-06T18:09:31+00:00
5
- * Last Modified: 2015-05-06T18:09:31+00:00
6
- * File: app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php
7
- * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
8
- */
9
-
10
-
11
- Mage::app()->setCurrentStore(Mage::getModel('core/store')->load(Mage_Core_Model_App::ADMIN_STORE_ID));
12
- $categories = Mage::getModel('catalog/category')
13
- ->getCollection();
14
- foreach($categories as $category) {
15
- $category->setPbPbgspUploadActive(1);
16
- $category->save();
17
- }
18
-
19
- ?>
 
1
+ <<<<<<< HEAD
2
+ <?php
3
+ /**
4
+ * Product: Pb_Pbgsp (1.0.0)
5
+ * Packaged: 2015-05-06T18:09:31+00:00
6
+ * Last Modified: 2015-05-06T18:09:31+00:00
7
+ * File: app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php
8
+ * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
9
+ */
10
+
11
+
12
+ Mage::app()->setCurrentStore(Mage::getModel('core/store')->load(Mage_Core_Model_App::ADMIN_STORE_ID));
13
+ $categories = Mage::getModel('catalog/category')
14
+ ->getCollection();
15
+ foreach($categories as $category) {
16
+ $category->setPbPbgspUploadActive(1);
17
+ $category->save();
18
+ }
19
+
20
+ ?>
app/code/local/Pb/Pbgsp/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <Pb_Pbgsp>
5
- <version>1.0.0</version>
6
  </Pb_Pbgsp>
7
  </modules>
8
  <global>
@@ -233,6 +233,8 @@
233
  <catalog_encryption_enabled>0</catalog_encryption_enabled>
234
  <asn_generation_enabled>1</asn_generation_enabled>
235
  <suppress_domestic_tracking>1</suppress_domestic_tracking>
 
 
236
  <custom_shipment_email_subject><![CDATA[{{var store.getFrontendName()}}: Shipment confirmation for Order # {{var order.increment_id}}]]>
237
  </custom_shipment_email_subject>
238
  <custom_shipment_email_template><![CDATA[<h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;"">Hello, {{htmlescape var=$order.getCustomerName()}}</h1>
2
  <config>
3
  <modules>
4
  <Pb_Pbgsp>
5
+ <version>1.0.1</version>
6
  </Pb_Pbgsp>
7
  </modules>
8
  <global>
233
  <catalog_encryption_enabled>0</catalog_encryption_enabled>
234
  <asn_generation_enabled>1</asn_generation_enabled>
235
  <suppress_domestic_tracking>1</suppress_domestic_tracking>
236
+ <notify_catalog_ok>0</notify_catalog_ok>
237
+ <notify_catalog_err>1</notify_catalog_err>
238
  <custom_shipment_email_subject><![CDATA[{{var store.getFrontendName()}}: Shipment confirmation for Order # {{var order.increment_id}}]]>
239
  </custom_shipment_email_subject>
240
  <custom_shipment_email_template><![CDATA[<h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;"">Hello, {{htmlescape var=$order.getCustomerName()}}</h1>
app/code/local/Pb/Pbgsp/etc/system.xml CHANGED
@@ -175,11 +175,29 @@
175
  <show_in_website>1</show_in_website>
176
  <show_in_store>1</show_in_store>
177
  </encryption_public_key>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
178
  <asn_generation_enabled translate="label">
179
  <label>Generate ASN</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>
@@ -370,6 +388,51 @@
370
  <show_in_website>1</show_in_website>
371
  <show_in_store>1</show_in_store>
372
  </separate_log_file>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
373
  </fields>
374
  </pbgsp>
375
  </groups>
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>
388
  <show_in_website>1</show_in_website>
389
  <show_in_store>1</show_in_store>
390
  </separate_log_file>
391
+ <return_address_street1 translate="label">
392
+ <label>Return Address Street 1</label>
393
+ <frontend_type>text</frontend_type>
394
+
395
+ <sort_order>284</sort_order>
396
+ <show_in_default>1</show_in_default>
397
+ <show_in_website>1</show_in_website>
398
+ <show_in_store>1</show_in_store>
399
+ </return_address_street1>
400
+ <return_address_city translate="label">
401
+ <label>Return Address City</label>
402
+ <frontend_type>text</frontend_type>
403
+
404
+ <sort_order>285</sort_order>
405
+ <show_in_default>1</show_in_default>
406
+ <show_in_website>1</show_in_website>
407
+ <show_in_store>1</show_in_store>
408
+ </return_address_city>
409
+ <return_address_state translate="label">
410
+ <label>Province/State</label>
411
+ <frontend_type>text</frontend_type>
412
+
413
+ <sort_order>286</sort_order>
414
+ <show_in_default>1</show_in_default>
415
+ <show_in_website>1</show_in_website>
416
+ <show_in_store>1</show_in_store>
417
+ </return_address_state>
418
+ <return_address_country translate="label">
419
+ <label>Country</label>
420
+ <frontend_type>select</frontend_type>
421
+ <source_model>adminhtml/system_config_source_country</source_model>
422
+ <sort_order>287</sort_order>
423
+ <show_in_default>1</show_in_default>
424
+ <show_in_website>1</show_in_website>
425
+ <show_in_store>1</show_in_store>
426
+ </return_address_country>
427
+ <return_address_zip translate="label">
428
+ <label>Zip or Postal Code</label>
429
+ <frontend_type>text</frontend_type>
430
+
431
+ <sort_order>288</sort_order>
432
+ <show_in_default>1</show_in_default>
433
+ <show_in_website>1</show_in_website>
434
+ <show_in_store>1</show_in_store>
435
+ </return_address_zip>
436
  </fields>
437
  </pbgsp>
438
  </groups>
app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php CHANGED
@@ -1,8 +1,9 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.0.0)
4
- * Packaged: 2015-06-04T15:09:31+00:00
5
  * Last Modified: 2015-06-04T15:00:31+00:00
 
6
  * File: app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php
7
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
@@ -90,7 +91,5 @@ $eav->addAttribute('catalog_category', 'pb_pbgsp_upload_active', array(
90
  'group' => 'PBGSP'
91
 
92
  ));
93
-
94
-
95
  $installer->endSetup();
96
  ?>
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.0.1)
4
+ * Packaged: 2015-09-21T15:12:31+00:00
5
  * Last Modified: 2015-06-04T15:00:31+00:00
6
+
7
  * File: app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php
8
  * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
9
  */
91
  'group' => 'PBGSP'
92
 
93
  ));
 
 
94
  $installer->endSetup();
95
  ?>
app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.0.0-1.0.1.php ADDED
@@ -0,0 +1,26 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Product: Pb_Pbgsp (1.0.1)
4
+ * Packaged: 2015-09-21T15:12:31+00:00
5
+ * Last Modified: 2015-06-04T15:00:31+00:00
6
+
7
+ * File: app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php
8
+ * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
9
+ */
10
+
11
+
12
+ $installer = $this;
13
+
14
+ $installer->startSetup();
15
+
16
+ $installer->run("
17
+
18
+
19
+ Alter TABLE {$this->getTable('pb_pbgsp/ordernumber')} add `hub_city` varchar(50) null;
20
+
21
+
22
+
23
+ ");
24
+
25
+ $installer->endSetup();
26
+ ?>
app/etc/modules/Pb_Pbgsp.xml CHANGED
@@ -1,12 +1,12 @@
1
- <?xml version="1.0"?>
2
- <config>
3
- <modules>
4
- <Pb_Pbgsp>
5
- <active>true</active>
6
- <codePool>local</codePool>
7
- <depends>
8
- </depends>
9
- </Pb_Pbgsp>
10
- </modules>
11
- </config>
12
-
1
+ <?xml version="1.0"?>
2
+ <config>
3
+ <modules>
4
+ <Pb_Pbgsp>
5
+ <active>true</active>
6
+ <codePool>local</codePool>
7
+ <depends>
8
+ </depends>
9
+ </Pb_Pbgsp>
10
+ </modules>
11
+ </config>
12
+
app/locale/en_US/Pb_Clearpath.csv ADDED
@@ -0,0 +1,4 @@
 
 
 
 
1
+ "Shipping &amp; Handling","Transportation Charges"
2
+ "Shipping & Handling","Transportation Charges"
3
+ "Duty & Taxes","Importation Charges"
4
+ "Duty &amp; Taxes","Importation Charges"
app/locale/en_US/template/email/pbgsp_shipment_new.html ADDED
@@ -0,0 +1,12 @@
 
 
 
 
 
 
 
 
 
 
 
 
1
+
2
+ <h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;"">Hello, {{var customerName}}</h1>
3
+ <p style="font-size:12px; line-height:16px; margin:0;">
4
+ Thank you for your order from {{var storeName}}.
5
+ You can check the status of your order by <a href="{{var customerAccountUrl}}" style="color:#1E7EC8;">logging into your account</a>.
6
+
7
+ </p>
8
+ <p style="font-size:12px; line-height:16px; margin:0;">
9
+ Your shipping confirmation is below. Thank you again for your business.
10
+ </p>
11
+
12
+ <h2 style="font-size:18px; font-weight:normal; margin:0;">Your Order #{{var orderNumber}} has been shipped from local warehouse to international shipment hub from where it will be shipped to your country.</h2>
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>pitneybowes_gsp</name>
4
- <version>1.0.0</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License (OSL)</license>
7
  <channel>community</channel>
@@ -22,11 +22,19 @@ Providing full international tracking linked from your admin page&#xD;
22
  &lt;/ul&gt;&#xD;
23
  To learn more, go to &lt;a href="http://www.pb.com/ecom"&gt;http://www.pb.com/ecom&lt;/a&gt;&#xD;
24
  </description>
25
- <notes>Initial Stable GSP release for Magento Connect.</notes>
 
 
 
 
 
 
 
 
26
  <authors><author><name>Raymond Lai</name><user>r3lai</user><email>raymond.lai@pb.com</email></author></authors>
27
- <date>2015-06-04</date>
28
- <time>14:15:41</time>
29
- <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="4d860488518cd57f776c3d2fe423437a"/></dir><file name="Totals.php" hash="cf0e69cb9d436ccf2aafb99bd0fc272c"/></dir></dir></dir><dir name="Checkout"><dir name="Shipping"><dir name="Method"><file name="Available.php" hash="a8ba337dd2cb0281f95f548a8f69c47a"/></dir></dir></dir><file name="Form.php" hash="82c8f0e9b90991f393d7e04919f8d2f8"/><dir name="Sales"><dir name="Order"><dir name="Invoice"><file name="Totals.php" hash="f2b39fe7a2a19e96edd934c05bac50b1"/></dir><file name="Totals.php" hash="d9dfa66b18a79d1ef5e31607de445207"/></dir></dir></dir><dir name="Model"><file name="Api.php" hash="fa5ee4bb423ddf60c097fb61d12bc43b"/><dir name="Carrier"><file name="ShippingMethod.php" hash="06b0c62606456ec1b9dcd4ea413e6bc4"/></dir><dir name="Catalog"><file name="Category.php" hash="002f69dea2c831e04399600c15885964"/><file name="Cron.php" hash="f6992f831ee453b15a95cffed9332a1f"/><file name="File.php" hash="779960aa2d2ab50382127890c7a0ad87"/><file name="Product.php" hash="d09b2f56cb76a693ef87a8452834e96e"/></dir><file name="Credentials.php" hash="946390c588ec28db30343250e23f988b"/><dir name="Creditmemo"><file name="Duty.php" hash="b123de9cdcaac1de04cdcf94d4d1fc06"/></dir><file name="Handlingoptions.php" hash="36aeb268f7ecb615854039b9981ccf9f"/><file name="Helper.php" hash="18781bf68a57a8c416c1a37f041ac412"/><file name="Inboundparcel.php" hash="8ead6048c8ecb66327e2b83d2af3dcc4"/><dir name="Invoice"><file name="Duty.php" hash="1d531b8c6de4345481caff2cd916f836"/></dir><file name="Messages.php" hash="728b54383aafa7f4e6a7e57202bb813f"/><dir name="Mysql4"><dir name="Inboundparcel"><file name="Collection.php" hash="e1c99046f446067d67b9163151644886"/></dir><file name="Inboundparcel.php" hash="fd0e3e6f43740107583e1ad20c384aea"/><dir name="Ordernumber"><file name="Collection.php" hash="a57c9def45246f684886a89222ff7130"/></dir><file name="Ordernumber.php" hash="bf03953bfcc552fafc142ade3c02fc47"/><dir name="Variable"><file name="Collection.php" hash="230ed58bde61c41735ae9641b5309d2c"/></dir><file name="Variable.php" hash="978acaba585304135920a747e0dbeaaf"/></dir><file name="Observer.php" hash="9ef19992c6015cb6e187802a9307b572"/><file name="Ordernumber.php" hash="14709487c0af7b66f281a50cc9d1b7db"/><dir name="Pdf"><file name="Tax.php" hash="707cc6e01dfd325229c5831ce4cfc4e5"/></dir><dir name="Quote"><file name="Duty.php" hash="8d6d1951ef8e5782c7fa524ea8100764"/></dir><dir name="Resource"><dir name="Mysql4"><file name="Setup.php" hash="4da3fcbfbbaef186a630cd0d83309af5"/></dir></dir><dir name="Sales"><dir name="Order"><file name="Shipment.php" hash="0d65ba103b988bdade20f087a50cefc9"/></dir></dir><file name="Util.php" hash="7b417bc17989eb5ac8cf6d2de0af9f4f"/><file name="Variable.php" hash="16eea17bd4a8f87d06b879c2ce5f8248"/></dir><file name="README" hash="5baea7c4c231d8cda23465a1abd5427e"/><dir name="data"><dir name="pb_pbgsp_setup"><file name="data-install-1.0.0.php" hash="157ad9a71ff8a03526729ddae484c9dc"/></dir></dir><dir name="etc"><file name="config.xml" hash="93ae6a04d17083ede60045350c8cdd95"/><file name="system.xml" hash="75bf1ced1440e4dce3f7d1b2f2ec7494"/></dir><dir name="sql"><dir name="pbgsp_setup"><file name="mysql4-install-1.0.0.php" hash="c4cd1f91694e74f08fe512534cfbf20c"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Pb_Pbgsp.xml" hash="dc3ea1c2b33fc8e526486c17a24965a4"/></dir></target></contents>
30
  <compatible/>
31
- <dependencies><required><php><min>5.1.0</min><max>5.3.3</max></php><extension><name>gnupg</name><min>1.3.5</min><max>1.3.6</max></extension></required></dependencies>
32
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>pitneybowes_gsp</name>
4
+ <version>1.0.1</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License (OSL)</license>
7
  <channel>community</channel>
22
  &lt;/ul&gt;&#xD;
23
  To learn more, go to &lt;a href="http://www.pb.com/ecom"&gt;http://www.pb.com/ecom&lt;/a&gt;&#xD;
24
  </description>
25
+ <notes>Patch release for Magento Connect.&#xD;
26
+ &#xD;
27
+ 1. Fixed a production issue when exportedFiles variable is null&#xD;
28
+ 2. Added City to the Pitney Bowes Hub address provided to store admin on order details&#xD;
29
+ 3. Update PB tracking URL to https://parceltracking.pb.com/app/#/dashboard/UPIDHERE&#xD;
30
+ 4. Fixed issue with international tracking url&#xD;
31
+ 5. Fixed a production issue when exportedFiles variable is null&#xD;
32
+ 6. Fixed issue with ASN request not sending correct commodity quantity.&#xD;
33
+ 7. Made the PGP extension not required for installation thru the Magento Connect process.</notes>
34
  <authors><author><name>Raymond Lai</name><user>r3lai</user><email>raymond.lai@pb.com</email></author></authors>
35
+ <date>2015-08-21</date>
36
+ <time>12:30:19</time>
37
+ <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="e19e0b4f6e68b8f2beb6e204f6a4d724"/></dir><file name="Totals.php" hash="bec6dadaf5192a2121142c957b986afe"/></dir></dir></dir><dir name="Checkout"><dir name="Shipping"><dir name="Method"><file name="Available.php" hash="a6d7e535d2e40a9ca26fda48454535f0"/></dir></dir></dir><file name="Form.php" hash="a891bb9daa64405d74a1bb3e5d2121fa"/><dir name="Sales"><dir name="Order"><dir name="Invoice"><file name="Totals.php" hash="a0e92e787a97b041bf0a8a688c6a7c71"/></dir><file name="Totals.php" hash="55456aaf254d56ffe270a2dbf644c1a6"/></dir></dir></dir><dir name="Model"><file name="Api.php" hash="ebedede75a9b4e185098303e9406673d"/><dir name="Carrier"><file name="ShippingMethod.php" hash="3c74b0f20612fb9824ce32ba6685b2a7"/></dir><dir name="Catalog"><file name="Category.php" hash="bfd7659a569bbfbe70cdf7db790dfe32"/><file name="Cron.php" hash="e326d4933ff0a5f2d83c5f5f77e04cd5"/><file name="File.php" hash="e9342a06a921e9c30c021524f4968c0a"/><file name="Product.php" hash="b75d886687e076428a8288e46e7f06ed"/></dir><file name="Credentials.php" hash="fb656424c317e5cd53b0f38d2bca5b70"/><dir name="Creditmemo"><file name="Duty.php" hash="529b460ea6c82f34d060a3fd312d185f"/></dir><file name="Handlingoptions.php" hash="74ce348e3d9fb58ce796fb6e8020a27f"/><file name="Helper.php" hash="851943d37bd46bfc7d02d77ad00cdee0"/><file name="Inboundparcel.php" hash="fa8e9831fd71c4909121ca445dd629b5"/><dir name="Invoice"><file name="Duty.php" hash="d41ba71b7e58442ae213c1789f7493a4"/></dir><file name="Messages.php" hash="75d389f766c0ab12a65f6dcb7fbbead1"/><dir name="Mysql4"><dir name="Inboundparcel"><file name="Collection.php" hash="54f5631e4214e0f0d11f5d994c85c84d"/></dir><file name="Inboundparcel.php" hash="e3b46e29f8e01cd8817c6f7e37f6609f"/><dir name="Ordernumber"><file name="Collection.php" hash="46be49457d2401cbba4cabc3fbf08c87"/></dir><file name="Ordernumber.php" hash="79b778c2f785d45ff2b74a6f08c99b7a"/><dir name="Variable"><file name="Collection.php" hash="1761733aa1fbecf9b993ab3e7b582037"/></dir><file name="Variable.php" hash="f37231c6f5702fde283fb7a5461a7913"/></dir><file name="Observer.php" hash="fd6b16164a22177685ba72e201e0f05e"/><file name="Ordernumber.php" hash="a7d98e0cd28dc10158f42451df2edbea"/><dir name="Pdf"><file name="Tax.php" hash="37f5148a5f1dde7c196ee4c36ab7915a"/></dir><dir name="Quote"><file name="Duty.php" hash="dfa4e108e2fd65695dca21bfa4b6bcd7"/></dir><dir name="Resource"><dir name="Mysql4"><file name="Setup.php" hash="9f20045e0b02d69285f59d812160eacb"/></dir></dir><dir name="Sales"><dir name="Order"><file name="Shipment.php" hash="7dfdb106f85e3f64a762a7d89a8978f1"/></dir></dir><file name="Util.php" hash="9404d762270d19e96fc8a4af3959e786"/><file name="Variable.php" hash="a8da1c3c00de7405d33c86f23a72ce97"/></dir><file name="README" hash="e7ad1d9a7ba016753e381a9ca92b696e"/><dir name="data"><dir name="pb_pbgsp_setup"><file name="data-install-1.0.0.php" hash="f01ff5e18e144eed6525908622d1733d"/></dir></dir><dir name="etc"><file name="config.xml" hash="cd07d8dcac33bc08cc62eb66e7bd8761"/><file name="system.xml" hash="32456da492543f56536323a99fd4cc00"/></dir><dir name="sql"><dir name="pbgsp_setup"><file name="mysql4-install-1.0.0.php" hash="96dbcd6e0b0552134a25eff9b0c18f58"/><file name="mysql4-upgrade-1.0.0-1.0.1.php" hash="4d971bca60e36160986a1809f314e6bf"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Pb_Pbgsp.xml" hash="8475d60d4719f8ea7761a4ca39016e48"/></dir></target><target name="magelocale"><dir name="en_US"><file name="Pb_Clearpath.csv" hash="aa4b7a650feb1709a34b6c053b56811c"/><dir name="template"><dir name="email"><file name="pbgsp_shipment_new.html" hash="2cc5cdbeaa719f4dab6a7c9e29fd6574"/></dir></dir></dir></target></contents>
38
  <compatible/>
39
+ <dependencies><required><php><min>5.1.0</min><max>5.3.3</max></php></required></dependencies>
40
  </package>