pitneybowes_gsp - Version 1.3.9

Version Notes

1. Modified product URL in catalog export CSV file to accurately link to the product and categories in the store.

Download this release

Release Info

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


Code changes from version 1.3.8 to 1.3.9

Files changed (52) hide show
  1. app/code/local/Pb/Pbgsp/Block/Adminhtml/Categorysettings.php +3 -3
  2. app/code/local/Pb/Pbgsp/Block/Adminhtml/Categorysettings/Grid.php +3 -3
  3. app/code/local/Pb/Pbgsp/Block/Adminhtml/Sales/Order/Invoice/Totals.php +3 -3
  4. app/code/local/Pb/Pbgsp/Block/Adminhtml/Sales/Order/Totals.php +3 -3
  5. app/code/local/Pb/Pbgsp/Block/Adminhtml/Version.php +3 -3
  6. app/code/local/Pb/Pbgsp/Block/Checkout/Shipping/Method/Available.php +3 -3
  7. app/code/local/Pb/Pbgsp/Block/Form.php +3 -3
  8. app/code/local/Pb/Pbgsp/Block/Sales/Order/Invoice/Totals.php +3 -3
  9. app/code/local/Pb/Pbgsp/Block/Sales/Order/Totals.php +3 -3
  10. app/code/local/Pb/Pbgsp/Block/Tax/Checkout/Tax.php +3 -3
  11. app/code/local/Pb/Pbgsp/Helper/Data.php +3 -3
  12. app/code/local/Pb/Pbgsp/Model/Api.php +81 -42
  13. app/code/local/Pb/Pbgsp/Model/Carrier/ShippingMethod.php +3 -3
  14. app/code/local/Pb/Pbgsp/Model/Catalog/Category.php +4 -4
  15. app/code/local/Pb/Pbgsp/Model/Catalog/Cron.php +3 -3
  16. app/code/local/Pb/Pbgsp/Model/Catalog/File.php +8 -10
  17. app/code/local/Pb/Pbgsp/Model/Catalog/Product.php +12 -19
  18. app/code/local/Pb/Pbgsp/Model/Credentials.php +3 -3
  19. app/code/local/Pb/Pbgsp/Model/Creditmemo/Duty.php +3 -3
  20. app/code/local/Pb/Pbgsp/Model/Environmentconfig.php +3 -3
  21. app/code/local/Pb/Pbgsp/Model/Handledata.php +21 -0
  22. app/code/local/Pb/Pbgsp/Model/Handlingoptions.php +3 -3
  23. app/code/local/Pb/Pbgsp/Model/Helper.php +3 -3
  24. app/code/local/Pb/Pbgsp/Model/Inboundparcel.php +3 -3
  25. app/code/local/Pb/Pbgsp/Model/Invoice/Duty.php +3 -3
  26. app/code/local/Pb/Pbgsp/Model/Messages.php +3 -3
  27. app/code/local/Pb/Pbgsp/Model/Mysql4/Inboundparcel.php +3 -3
  28. app/code/local/Pb/Pbgsp/Model/Mysql4/Inboundparcel/Collection.php +3 -3
  29. app/code/local/Pb/Pbgsp/Model/Mysql4/Ordernumber.php +3 -3
  30. app/code/local/Pb/Pbgsp/Model/Mysql4/Ordernumber/Collection.php +3 -3
  31. app/code/local/Pb/Pbgsp/Model/Mysql4/Variable.php +3 -3
  32. app/code/local/Pb/Pbgsp/Model/Mysql4/Variable/Collection.php +3 -3
  33. app/code/local/Pb/Pbgsp/Model/Newhandlingoptions.php +21 -0
  34. app/code/local/Pb/Pbgsp/Model/Observer.php +3 -3
  35. app/code/local/Pb/Pbgsp/Model/Ordernumber.php +3 -3
  36. app/code/local/Pb/Pbgsp/Model/Pdf/Tax.php +3 -3
  37. app/code/local/Pb/Pbgsp/Model/Productattributesource/Productconditions.php +3 -3
  38. app/code/local/Pb/Pbgsp/Model/Quote/Duty.php +3 -3
  39. app/code/local/Pb/Pbgsp/Model/Resource/Mysql4/Setup.php +3 -3
  40. app/code/local/Pb/Pbgsp/Model/Sales/Order/Shipment.php +3 -3
  41. app/code/local/Pb/Pbgsp/Model/Util.php +18 -3
  42. app/code/local/Pb/Pbgsp/Model/Variable.php +3 -3
  43. app/code/local/Pb/Pbgsp/controllers/Adminhtml/CategorysettingsController.php +3 -3
  44. app/code/local/Pb/Pbgsp/data/pb_pbgsp_setup/data-install-1.0.0.php +3 -3
  45. app/code/local/Pb/Pbgsp/etc/config.xml +1 -1
  46. app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php +3 -3
  47. app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.0.0-1.0.1.php +3 -3
  48. app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.1.1-1.1.2.php +3 -3
  49. app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.2.0-1.2.1.php +3 -3
  50. app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.3.0-1.3.1.php +3 -3
  51. app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.3.5-1.3.6.php +3 -3
  52. package.xml +5 -7
app/code/local/Pb/Pbgsp/Block/Adminhtml/Categorysettings.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.8)
4
- * Packaged: 2016-06-23T10:40:00+00:00
5
- * Last Modified: 2016-06-01T14:02:28+00:00
6
  */
7
 
8
  class Pb_Pbgsp_Block_Adminhtml_Categorysettings extends Mage_Adminhtml_Block_Widget_Grid_Container {
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.9)
4
+ * Packaged: 2016-07-26T14:17:00+00:00
5
+ * Last Modified: 2016-06-23T10:40:00+00:00
6
  */
7
 
8
  class Pb_Pbgsp_Block_Adminhtml_Categorysettings extends Mage_Adminhtml_Block_Widget_Grid_Container {
app/code/local/Pb/Pbgsp/Block/Adminhtml/Categorysettings/Grid.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.8)
4
- * Packaged: 2016-06-23T10:40:00+00:00
5
- * Last Modified: 2016-06-01T14:02:28+00:00
6
  */
7
 
8
  class Pb_Pbgsp_Block_Adminhtml_Categorysettings_Grid extends Mage_Adminhtml_Block_Widget_Grid {
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.9)
4
+ * Packaged: 2016-07-26T14:17:00+00:00
5
+ * Last Modified: 2016-06-23T10:40:00+00:00
6
  */
7
 
8
  class Pb_Pbgsp_Block_Adminhtml_Categorysettings_Grid extends Mage_Adminhtml_Block_Widget_Grid {
app/code/local/Pb/Pbgsp/Block/Adminhtml/Sales/Order/Invoice/Totals.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.8)
4
- * Packaged: 2016-06-23T10:40:00+00:00
5
- * Last Modified: 2016-06-01T14:02:28+00:00
6
  * File: app/code/local/Pb/Pbgsp/Block/Adminhtml/Sales/Order/Invoice/Totals.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.9)
4
+ * Packaged: 2016-07-26T14:17:00+00:00
5
+ * Last Modified: 2016-06-23T10:40:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Block/Adminhtml/Sales/Order/Invoice/Totals.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/Block/Adminhtml/Sales/Order/Totals.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.8)
4
- * Packaged: 2016-06-23T10:40:00+00:00
5
- * Last Modified: 2016-06-01T14:02:28+00:00
6
  * File: app/code/local/Pb/Pbgsp/Block/Adminhtml/Sales/Order/Totals.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.9)
4
+ * Packaged: 2016-07-26T14:17:00+00:00
5
+ * Last Modified: 2016-06-23T10:40:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Block/Adminhtml/Sales/Order/Totals.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/Block/Adminhtml/Version.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.8)
4
- * Packaged: 2016-06-23T10:40:00+00:00
5
- * Last Modified: 2016-06-01T14:02:28+00:00
6
 
7
 
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.9)
4
+ * Packaged: 2016-07-26T14:17:00+00:00
5
+ * Last Modified: 2016-06-23T10:40:00+00:00
6
 
7
 
8
  */
app/code/local/Pb/Pbgsp/Block/Checkout/Shipping/Method/Available.php CHANGED
@@ -1,9 +1,9 @@
1
  <?php
2
 
3
  /**
4
- * Product: Pb_Pbgsp (1.3.8)
5
- * Packaged: 2016-06-23T10:40:00+00:00
6
- * Last Modified: 2016-06-01T14:02:28+00:00
7
  * File: app/code/local/Pb/Pbgsp/Block/Checkout/Shipping/Method/Available.php
8
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
9
  */
1
  <?php
2
 
3
  /**
4
+ * Product: Pb_Pbgsp (1.3.9)
5
+ * Packaged: 2016-07-26T14:17:00+00:00
6
+ * Last Modified: 2016-06-23T10:40:00+00:00
7
  * File: app/code/local/Pb/Pbgsp/Block/Checkout/Shipping/Method/Available.php
8
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
9
  */
app/code/local/Pb/Pbgsp/Block/Form.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.8)
4
- * Packaged: 2016-06-23T10:40:00+00:00
5
- * Last Modified: 2016-06-01T14:02:28+00:00
6
  * File: app/code/local/Pb/Pbgsp/Block/Form.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.9)
4
+ * Packaged: 2016-07-26T14:17:00+00:00
5
+ * Last Modified: 2016-06-23T10:40:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Block/Form.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/Block/Sales/Order/Invoice/Totals.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.8)
4
- * Packaged: 2016-06-23T10:40:00+00:00
5
- * Last Modified: 2016-06-01T14:02:28+00:00
6
  * File: app/code/local/Pb/Pbgsp/Block/Sales/Order/Invoice/Totals.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.9)
4
+ * Packaged: 2016-07-26T14:17:00+00:00
5
+ * Last Modified: 2016-06-23T10:40:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Block/Sales/Order/Invoice/Totals.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/Block/Sales/Order/Totals.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.8)
4
- * Packaged: 2016-06-23T10:40:00+00:00
5
- * Last Modified: 2016-06-01T14:02:28+00:00
6
  * File: app/code/local/Pb/Pbgsp/Block/Sales/Order/Totals.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.9)
4
+ * Packaged: 2016-07-26T14:17:00+00:00
5
+ * Last Modified: 2016-06-23T10:40:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Block/Sales/Order/Totals.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/Block/Tax/Checkout/Tax.php CHANGED
@@ -1,9 +1,9 @@
1
  <?php
2
 
3
  /**
4
- * Product: Pb_Pbgsp (1.3.8)
5
- * Packaged: 2016-06-23T10:40:00+00:00
6
- * Last Modified: 2016-06-01T14:02:28+00:00
7
  */
8
  class Pb_Pbgsp_Block_Tax_Checkout_Tax extends Mage_Tax_Block_Checkout_Tax
9
  {
1
  <?php
2
 
3
  /**
4
+ * Product: Pb_Pbgsp (1.3.9)
5
+ * Packaged: 2016-07-26T14:17:00+00:00
6
+ * Last Modified: 2016-06-23T10:40:00+00:00
7
  */
8
  class Pb_Pbgsp_Block_Tax_Checkout_Tax extends Mage_Tax_Block_Checkout_Tax
9
  {
app/code/local/Pb/Pbgsp/Helper/Data.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.8)
4
- * Packaged: 2016-06-23T10:40:00+00:00
5
- * Last Modified: 2016-06-01T14:02:28+00:00
6
 
7
  */
8
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.9)
4
+ * Packaged: 2016-07-26T14:17:00+00:00
5
+ * Last Modified: 2016-06-23T10:40:00+00:00
6
 
7
  */
8
 
app/code/local/Pb/Pbgsp/Model/Api.php CHANGED
@@ -1,10 +1,15 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.8)
4
- * Packaged: 2016-06-23T10:40:00+00:00
5
- * Last Modified: 2016-06-01T14:02:28+00:00
 
 
 
 
 
6
  * File: app/code/local/Pb/Pbgsp/Model/Api.php
7
- * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
9
  class Pb_Pbgsp_Model_Api
10
  {
@@ -21,7 +26,7 @@ class Pb_Pbgsp_Model_Api
21
  curl_setopt($curl, CURLOPT_POST, 1);
22
 
23
  if ($data) {
24
- $dataString = json_encode($data);
25
  Pb_Pbgsp_Model_Util::log("Data to pass to get quote $dataString");
26
  $headers[] = 'Content-Type: application/json';
27
  $headers[] = 'Content-Length: ' . strlen($dataString);
@@ -32,7 +37,7 @@ class Pb_Pbgsp_Model_Api
32
  case "PUT":
33
  curl_setopt($curl, CURLOPT_CUSTOMREQUEST, 'PUT');
34
  if ($data) {
35
- $dataString = json_encode($data);
36
  Pb_Pbgsp_Model_Util::log("Data to pass to PUT $dataString");
37
  $headers[] = 'Content-Type: application/json';
38
  $headers[] = 'Content-Length: ' . strlen($dataString);
@@ -160,11 +165,7 @@ class Pb_Pbgsp_Model_Api
160
  ($product->getParentItem() && $product->isChildrenCalculated())) {
161
  /* @var Mage_Sales_Model_Order_Item $product */
162
 
163
- $qty = $product->getQty();
164
- if(!$qty) {
165
- $qty = $product->getQtyToShip();
166
- }
167
- $totalProducts += $qty;
168
 
169
  // Pb_Pbgsp_Model_Util::log('discount amount '. $product->getDiscountAmount());
170
  // Pb_Pbgsp_Model_Util::log('Price '. $product->getPrice());
@@ -172,11 +173,36 @@ class Pb_Pbgsp_Model_Api
172
  $price = $product->getPrice() - $product->getDiscountAmount();//$price - ($product->getDiscountAmount() * $product->getQty());
173
  if($price == 0)
174
  $price = 0.01; //set this price so that quote could be retrieved.
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
175
  array_push($basketLines, array(
176
  "lineId" => $product->getSku(),
177
- "commodity" => array('merchantComRefId' => $product->getSku()),
 
 
 
 
 
178
  "unitPrice" => array('price' => array('value' => $price)),
179
- "quantity" => intval($qty)
180
 
181
  )
182
  );
@@ -217,18 +243,13 @@ class Pb_Pbgsp_Model_Api
217
  $familyName = $address->getLastname(); //when it comes from paypal express, lastname is null, Kamran, Bigpixel Studio,
218
  if(!$familyName)
219
  $familyName = $address->getFirstname();
220
- $phone = $address->getTelephone();
221
- if(!$phone)
222
- $phone = Pb_Pbgsp_Model_Credentials::getCustomerServiceNumber();
223
- if(!$phone)
224
- $phone = '555-555-1234';
225
  $consignee = array(
226
  'familyName' => $familyName,
227
  'givenName' => $address->getFirstname(),
228
  'email' => $email,
229
  'phoneNumbers' => array(
230
  array(
231
- 'number' => $phone,
232
  'type' => 'other'
233
  )
234
  )
@@ -244,18 +265,48 @@ class Pb_Pbgsp_Model_Api
244
  'postalOrZipCode' => $address->getPostcode()
245
  );
246
  $currency = 'USD';//Mage::app()->getStore()->getCurrentCurrencyCode();
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
247
  $basket = array(
248
  'merchantId' => Pb_Pbgsp_Model_Credentials::getMerchantCode(),
249
  'purchaserIPAddress' => self::getClientIP(),
250
- 'transactionId' => mt_rand(100000, 999999),
251
  'quoteCurrency' => $currency,
252
- 'basketLines' => $basketLines
253
- ,
254
  'toHubTransportations' => $toHubTransportations,
255
- 'consignee' => $consignee
256
- ,
257
- 'shippingAddress' => $shippingAddress
258
-
259
  );
260
 
261
 
@@ -310,15 +361,9 @@ class Pb_Pbgsp_Model_Api
310
  // ->setData('order_id', $shipment->getData('order_id'))
311
  // ->save();
312
  }
313
-
314
- //Pb_Pbgsp_Model_Util::log(get_class($number));
315
- if(get_class($number) == 'SimpleXMLElement') {
316
- $json = json_encode($number);
317
- $array = json_decode($json,TRUE);
318
- $number = $array[0];
319
- }
320
-
321
-
322
  $requestBody = array(
323
  'merchantOrderNumber' => $cpOrderNumber,
324
  'parcelIdentificationNumber' => $number,
@@ -498,13 +543,7 @@ class Pb_Pbgsp_Model_Api
498
 
499
 
500
 
501
-
502
  $billingAddress = $order->getBillingAddress();
503
- $phone = $billingAddress->getTelephone();
504
- if(!$phone)
505
- $phone = Pb_Pbgsp_Model_Credentials::getCustomerServiceNumber();
506
- if(!$phone)
507
- $phone = '555-555-1234';
508
  $confirm = array(
509
  'transactionId' => $order->getRealOrderId(),
510
  'merchantOrderNumber' => $order->getRealOrderId(),
@@ -514,7 +553,7 @@ class Pb_Pbgsp_Model_Api
514
  'email' => $order->getCustomerEmail(),
515
  'phoneNumbers' => array(
516
  array(
517
- 'number' => $phone ,
518
  'type' => 'other'
519
  )
520
  )),
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.3)
4
+ * Packaged: 2016-02-23T11:12:30+00:00
5
+ * Last Modified: 2016-01-11T11:12:49+00:00
6
+
7
+
8
+
9
+
10
+
11
  * File: app/code/local/Pb/Pbgsp/Model/Api.php
12
+ * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
13
  */
14
  class Pb_Pbgsp_Model_Api
15
  {
26
  curl_setopt($curl, CURLOPT_POST, 1);
27
 
28
  if ($data) {
29
+ $dataString = json_encode($data,JSON_UNESCAPED_SLASHES);
30
  Pb_Pbgsp_Model_Util::log("Data to pass to get quote $dataString");
31
  $headers[] = 'Content-Type: application/json';
32
  $headers[] = 'Content-Length: ' . strlen($dataString);
37
  case "PUT":
38
  curl_setopt($curl, CURLOPT_CUSTOMREQUEST, 'PUT');
39
  if ($data) {
40
+ $dataString = json_encode($data,JSON_UNESCAPED_SLASHES);
41
  Pb_Pbgsp_Model_Util::log("Data to pass to PUT $dataString");
42
  $headers[] = 'Content-Type: application/json';
43
  $headers[] = 'Content-Length: ' . strlen($dataString);
165
  ($product->getParentItem() && $product->isChildrenCalculated())) {
166
  /* @var Mage_Sales_Model_Order_Item $product */
167
 
168
+ $totalProducts += $product->getQty();
 
 
 
 
169
 
170
  // Pb_Pbgsp_Model_Util::log('discount amount '. $product->getDiscountAmount());
171
  // Pb_Pbgsp_Model_Util::log('Price '. $product->getPrice());
173
  $price = $product->getPrice() - $product->getDiscountAmount();//$price - ($product->getDiscountAmount() * $product->getQty());
174
  if($price == 0)
175
  $price = 0.01; //set this price so that quote could be retrieved.
176
+ $actualProduct = Mage::getModel('catalog/product') -> load($product->getProductId());
177
+ /* @var Mage_Catalog_Model_Product $actualProduct */
178
+
179
+ $cats = $actualProduct->getCategoryIds();
180
+ $category_name= array();
181
+ foreach ($cats as $category_id) {
182
+ $_cat = Mage::getModel('catalog/category')->load($category_id) ;
183
+ $category_name[]= array("merchantCatRefId" =>$_cat->getName());
184
+ }
185
+ $shortDescription = Pb_Pbgsp_Model_Util::stripHtml($actualProduct -> getShortDescription());
186
+ $shortDescription = preg_replace("/[^A-Za-z0-9 .\-\+=;:\\(){}\[\]@?%$#]/",'',$shortDescription);
187
+ if (strlen($shortDescription) >= 2000) {
188
+
189
+ $shortDescription = Pb_Pbgsp_Model_Util::chopString($shortDescription, 1999);
190
+ }
191
+ $arDescriptions = array(array(
192
+ "locale" => "en_CA",
193
+ "name" => $product->getName(),
194
+ "shortDescription" => $shortDescription
195
+ ));
196
  array_push($basketLines, array(
197
  "lineId" => $product->getSku(),
198
+ "commodity" => array(
199
+ 'merchantComRefId' => $product->getSku(),
200
+ "descriptions" =>$arDescriptions,
201
+ "commodityUrl" => $actualProduct->getProductUrl(),
202
+ "categories" => $category_name,
203
+ ),
204
  "unitPrice" => array('price' => array('value' => $price)),
205
+ "quantity" => intval($product->getQty())
206
 
207
  )
208
  );
243
  $familyName = $address->getLastname(); //when it comes from paypal express, lastname is null, Kamran, Bigpixel Studio,
244
  if(!$familyName)
245
  $familyName = $address->getFirstname();
 
 
 
 
 
246
  $consignee = array(
247
  'familyName' => $familyName,
248
  'givenName' => $address->getFirstname(),
249
  'email' => $email,
250
  'phoneNumbers' => array(
251
  array(
252
+ 'number' => $address->getTelephone(),
253
  'type' => 'other'
254
  )
255
  )
265
  'postalOrZipCode' => $address->getPostcode()
266
  );
267
  $currency = 'USD';//Mage::app()->getStore()->getCurrentCurrencyCode();
268
+
269
+
270
+ // added seller information 30/06/2016
271
+ $contactdetail=array(
272
+ 'familyName' => Mage::getStoreConfig('carriers/pbgsp_setting/family_name'),
273
+ 'givenName' => Mage::getStoreConfig('carriers/pbgsp_setting/given_name'),
274
+ 'email' => Mage::getStoreConfig('carriers/pbgsp_setting/seller_email'),
275
+ 'phoneNumbers'=> array(
276
+ array(
277
+ 'number' => Mage::getStoreConfig('carriers/pbgsp_setting/phone_number'),
278
+ 'type' => Mage::getStoreConfig('carriers/pbgsp_setting/phone_number_type')
279
+ )
280
+ )
281
+ );
282
+
283
+ $sellerAddress= array(
284
+ 'street1' => Mage::getStoreConfig('carriers/pbgsp_setting/address_street1'),
285
+ 'city' => Mage::getStoreConfig('carriers/pbgsp_setting/address_city'),
286
+ 'provinceOrState' => Mage::getStoreConfig('carriers/pbgsp_setting/address_provinenceorstate'),
287
+ 'postalOrZipCode' => Mage::getStoreConfig('carriers/pbgsp_setting/address_postalorzipcode'),
288
+ 'country' => Mage::getStoreConfig('carriers/pbgsp_setting/address_country'),
289
+ );
290
+
291
+ $seller= array(
292
+ 'sellerID'=> Mage::getStoreConfig('carriers/pbgsp_setting/seller_id'),
293
+ //'sellerType'=> Mage::getStoreConfig('carriers/pbgsp_setting/seller_type'),
294
+ 'contactdetail'=>$contactdetail,
295
+ 'address'=>$sellerAddress
296
+ );
297
+
298
+ // end seller code
299
  $basket = array(
300
  'merchantId' => Pb_Pbgsp_Model_Credentials::getMerchantCode(),
301
  'purchaserIPAddress' => self::getClientIP(),
302
+ 'transactionId' => "".mt_rand(100000, 999999)."",
303
  'quoteCurrency' => $currency,
304
+ 'basketCurrency' => $currency,
305
+ 'basketLines' => $basketLines,
306
  'toHubTransportations' => $toHubTransportations,
307
+ 'consignee' => $consignee,
308
+ 'shippingAddress' => $shippingAddress,
309
+ //'seller' => $seller
 
310
  );
311
 
312
 
361
  // ->setData('order_id', $shipment->getData('order_id'))
362
  // ->save();
363
  }
364
+
365
+
366
+
 
 
 
 
 
 
367
  $requestBody = array(
368
  'merchantOrderNumber' => $cpOrderNumber,
369
  'parcelIdentificationNumber' => $number,
543
 
544
 
545
 
 
546
  $billingAddress = $order->getBillingAddress();
 
 
 
 
 
547
  $confirm = array(
548
  'transactionId' => $order->getRealOrderId(),
549
  'merchantOrderNumber' => $order->getRealOrderId(),
553
  'email' => $order->getCustomerEmail(),
554
  'phoneNumbers' => array(
555
  array(
556
+ 'number' => $billingAddress->getTelephone(),
557
  'type' => 'other'
558
  )
559
  )),
app/code/local/Pb/Pbgsp/Model/Carrier/ShippingMethod.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.8)
4
- * Packaged: 2016-06-23T10:40:00+00:00
5
- * Last Modified: 2016-06-01T14:02:28+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Carrier/ShippingMethod.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.9)
4
+ * Packaged: 2016-07-26T14:17:00+00:00
5
+ * Last Modified: 2016-06-23T10:40:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Carrier/ShippingMethod.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/Model/Catalog/Category.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.8)
4
- * Packaged: 2016-06-23T10:40:00+00:00
5
- * Last Modified: 2016-06-01T14:02:28+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Catalog/Category.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
@@ -78,7 +78,7 @@ class Pb_Pbgsp_Model_Catalog_Category {
78
  }
79
  public function writeToFile($file,$lastDiff) {
80
  if($this->_shouldUpload($lastDiff)) {
81
- $name = Pb_Pbgsp_Model_Catalog_File::stripHtml($this->getName());
82
  $name = preg_replace("/[^A-Za-z0-9 ,.\-\+=;:\\(){}\[\]@?%$#]/", '', $name);
83
 
84
  $parentCateID = '';
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.9)
4
+ * Packaged: 2016-07-26T14:17:00+00:00
5
+ * Last Modified: 2016-06-23T10:40:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Catalog/Category.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
78
  }
79
  public function writeToFile($file,$lastDiff) {
80
  if($this->_shouldUpload($lastDiff)) {
81
+ $name = Pb_Pbgsp_Model_Util::stripHtml($this->getName());
82
  $name = preg_replace("/[^A-Za-z0-9 ,.\-\+=;:\\(){}\[\]@?%$#]/", '', $name);
83
 
84
  $parentCateID = '';
app/code/local/Pb/Pbgsp/Model/Catalog/Cron.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.8)
4
- * Packaged: 2016-06-23T10:40:00+00:00
5
- * Last Modified: 2016-06-01T14:02:28+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Catalog/Cron.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.9)
4
+ * Packaged: 2016-07-26T14:17:00+00:00
5
+ * Last Modified: 2016-06-23T10:40:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Catalog/Cron.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/Model/Catalog/File.php CHANGED
@@ -1,9 +1,9 @@
1
  <?php
2
 
3
  /**
4
- * Product: Pb_Pbgsp (1.3.8)
5
- * Packaged: 2016-06-23T10:40:00+00:00
6
- * Last Modified: 2016-06-01T14:02:28+00:00
7
  * File: app/code/local/Pb/Pbgsp/Model/Catalog/File.php
8
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
9
  */
@@ -267,7 +267,7 @@ class Pb_Pbgsp_Model_Catalog_File {
267
  $fileRecordCount=0;
268
  $part++;
269
  }
270
- $pbChildProduct = new Pb_Pbgsp_Model_Catalog_Product($childProduct->getId(),sprintf($productUrlFormat,$product->getId()));
271
  $this->writeProduct($pbChildProduct,$cateId,$product->getSku(),$prodCat);
272
  $addedProducts[$childProduct->getSku()] = "added";
273
  $prodCount++;
@@ -279,7 +279,7 @@ class Pb_Pbgsp_Model_Catalog_File {
279
  if(!$childProduct->getPbPbgspUploadDeletedOn()) {
280
  if(!array_key_exists($childProduct->getSku(),$this->productsToDelete)) {
281
  $this->productsToDelete[$childProduct->getSku()] = array('product' => $childProduct,
282
- 'pbproduct' => new Pb_Pbgsp_Model_Catalog_Product($childProduct->getId(),sprintf($productUrlFormat,$product->getId())),
283
  'catid' => $cateId,
284
  'category' => $prodCat,
285
  'parentSku' => $product->getSku());
@@ -296,7 +296,7 @@ class Pb_Pbgsp_Model_Catalog_File {
296
  else {
297
  if(!$product->getPbPbgspUploadDelete()) {
298
  if (!array_key_exists($product->getSku(), $addedProducts)) {
299
- $pbProduct = new Pb_Pbgsp_Model_Catalog_Product($product, sprintf($productUrlFormat, $product->getId()));
300
  if ($fileRecordCount > $maxRecordsCount) {
301
  $this->_createNewCommoditiyFile($part);
302
  $fileRecordCount = 0;
@@ -314,7 +314,7 @@ class Pb_Pbgsp_Model_Catalog_File {
314
  if(!$product->getPbPbgspUploadDeletedOn()) {
315
  if(!array_key_exists($product->getSku(),$this->productsToDelete)) {
316
  $this->productsToDelete[$product->getSku()] = array('product' => $product,
317
- 'pbproduct' => new Pb_Pbgsp_Model_Catalog_Product($product->getId(),sprintf($productUrlFormat,$product->getId())),
318
  'catid' => $cateId,
319
  'category' => $prodCat,
320
  'parentSku' => $product->getSku());
@@ -845,9 +845,7 @@ class Pb_Pbgsp_Model_Catalog_File {
845
  }
846
  }
847
 
848
- public static function stripHtml($text) {
849
- return preg_replace("/<\s*\/\s*\w\s*.*?>|<\s*br\s*>/",'',preg_replace("/<\s*\w.*?>/", '', $text));
850
- }
851
 
852
  /**
853
  * Loads products without categories and logs them in log file
1
  <?php
2
 
3
  /**
4
+ * Product: Pb_Pbgsp (1.3.9)
5
+ * Packaged: 2016-07-26T14:17:00+00:00
6
+ * Last Modified: 2016-06-23T10:40:00+00:00
7
  * File: app/code/local/Pb/Pbgsp/Model/Catalog/File.php
8
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
9
  */
267
  $fileRecordCount=0;
268
  $part++;
269
  }
270
+ $pbChildProduct = new Pb_Pbgsp_Model_Catalog_Product($childProduct->getId(),$product->getUrlInStore());
271
  $this->writeProduct($pbChildProduct,$cateId,$product->getSku(),$prodCat);
272
  $addedProducts[$childProduct->getSku()] = "added";
273
  $prodCount++;
279
  if(!$childProduct->getPbPbgspUploadDeletedOn()) {
280
  if(!array_key_exists($childProduct->getSku(),$this->productsToDelete)) {
281
  $this->productsToDelete[$childProduct->getSku()] = array('product' => $childProduct,
282
+ 'pbproduct' => new Pb_Pbgsp_Model_Catalog_Product($childProduct->getId(),$product->getUrlInStore()),
283
  'catid' => $cateId,
284
  'category' => $prodCat,
285
  'parentSku' => $product->getSku());
296
  else {
297
  if(!$product->getPbPbgspUploadDelete()) {
298
  if (!array_key_exists($product->getSku(), $addedProducts)) {
299
+ $pbProduct = new Pb_Pbgsp_Model_Catalog_Product($product, $product->getUrlInStore());
300
  if ($fileRecordCount > $maxRecordsCount) {
301
  $this->_createNewCommoditiyFile($part);
302
  $fileRecordCount = 0;
314
  if(!$product->getPbPbgspUploadDeletedOn()) {
315
  if(!array_key_exists($product->getSku(),$this->productsToDelete)) {
316
  $this->productsToDelete[$product->getSku()] = array('product' => $product,
317
+ 'pbproduct' => new Pb_Pbgsp_Model_Catalog_Product($product->getId(),$product->getUrlInStore()),
318
  'catid' => $cateId,
319
  'category' => $prodCat,
320
  'parentSku' => $product->getSku());
845
  }
846
  }
847
 
848
+
 
 
849
 
850
  /**
851
  * Loads products without categories and logs them in log file
app/code/local/Pb/Pbgsp/Model/Catalog/Product.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.8)
4
- * Packaged: 2016-06-23T10:40:00+00:00
5
- * Last Modified: 2016-06-01T14:02:28+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Catalog/Product.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
@@ -23,7 +23,9 @@ class Pb_Pbgsp_Model_Catalog_Product {
23
  }
24
  else
25
  $this -> product = Mage::getModel('catalog/product') -> load($id);
26
- $this->_productUrl = $this -> product->getUrlInStore();// $url;
 
 
27
  }
28
 
29
  /**
@@ -123,21 +125,21 @@ class Pb_Pbgsp_Model_Catalog_Product {
123
  */
124
  public function writeToFile($file,$categoryCode,$parentSku,$category) {
125
  /** $categoryCode is passed in method because we don't have categoryCode for child products. BigPixel 6/11/2012 */
126
- $name = Pb_Pbgsp_Model_Catalog_File::stripHtml($this -> getName());
127
  $shortDescription ='';
128
  $name = preg_replace("/[^A-Za-z0-9 ,.\-\+=;:\\(){}\[\]@?%$#]/", '', $name);
129
- $description = Pb_Pbgsp_Model_Catalog_File::stripHtml($this -> getDescription());
130
  $description = preg_replace("/[^A-Za-z0-9 .\-\+=;:\\(){}\[\]@?%$#]/", '', $description);
131
  if (strlen($description) >= 2000) {
132
 
133
- $description = $this -> chopString($description, 1999);
134
  }
135
 
136
- $shortDescription = Pb_Pbgsp_Model_Catalog_File::stripHtml($this -> getShortDescription());
137
  $shortDescription = preg_replace("/[^A-Za-z0-9 .\-\+=;:\\(){}\[\]@?%$#]/",'',$shortDescription);
138
  if (strlen($shortDescription) >= 2000) {
139
 
140
- $shortDescription = $this -> chopString($shortDescription, 1999);
141
  }
142
 
143
 
@@ -225,16 +227,7 @@ class Pb_Pbgsp_Model_Catalog_Product {
225
  }
226
  }
227
 
228
- public function chopString($str, $len) {
229
- $end = $len;
230
- $lastFour = substr($str,$end - strlen("&amp"),strlen("&amp"));
231
- $pos = strpos($lastFour,"&");
232
- if (!($pos === FALSE)) {
233
- $end = $end - strlen("&amp") + $pos;
234
- }
235
- $ret = substr($str,0,$end);
236
- return $ret;
237
- }
238
 
239
  }
240
  ?>
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.9)
4
+ * Packaged: 2016-07-26T14:17:00+00:00
5
+ * Last Modified: 2016-06-23T10:40:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Catalog/Product.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
23
  }
24
  else
25
  $this -> product = Mage::getModel('catalog/product') -> load($id);
26
+ $this->_productUrl = $url;
27
+ if(!$this->_productUrl)
28
+ $this->_productUrl = $this -> product->getUrlInStore();// $url;
29
  }
30
 
31
  /**
125
  */
126
  public function writeToFile($file,$categoryCode,$parentSku,$category) {
127
  /** $categoryCode is passed in method because we don't have categoryCode for child products. BigPixel 6/11/2012 */
128
+ $name = Pb_Pbgsp_Model_Util::stripHtml($this -> getName());
129
  $shortDescription ='';
130
  $name = preg_replace("/[^A-Za-z0-9 ,.\-\+=;:\\(){}\[\]@?%$#]/", '', $name);
131
+ $description = Pb_Pbgsp_Model_Util::stripHtml($this -> getDescription());
132
  $description = preg_replace("/[^A-Za-z0-9 .\-\+=;:\\(){}\[\]@?%$#]/", '', $description);
133
  if (strlen($description) >= 2000) {
134
 
135
+ $description = Pb_Pbgsp_Model_Util::chopString($description, 1999);
136
  }
137
 
138
+ $shortDescription = Pb_Pbgsp_Model_Util::stripHtml($this -> getShortDescription());
139
  $shortDescription = preg_replace("/[^A-Za-z0-9 .\-\+=;:\\(){}\[\]@?%$#]/",'',$shortDescription);
140
  if (strlen($shortDescription) >= 2000) {
141
 
142
+ $shortDescription = Pb_Pbgsp_Model_Util::chopString($shortDescription, 1999);
143
  }
144
 
145
 
227
  }
228
  }
229
 
230
+
 
 
 
 
 
 
 
 
 
231
 
232
  }
233
  ?>
app/code/local/Pb/Pbgsp/Model/Credentials.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.8)
4
- * Packaged: 2016-06-23T10:40:00+00:00
5
- * Last Modified: 2016-06-01T14:02:28+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Credentials.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.9)
4
+ * Packaged: 2016-07-26T14:17:00+00:00
5
+ * Last Modified: 2016-06-23T10:40:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Credentials.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/Model/Creditmemo/Duty.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.8)
4
- * Packaged: 2016-06-23T10:40:00+00:00
5
- * Last Modified: 2016-06-01T14:02:28+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Creditmemo/Duty.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.9)
4
+ * Packaged: 2016-07-26T14:17:00+00:00
5
+ * Last Modified: 2016-06-23T10:40:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Creditmemo/Duty.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/Model/Environmentconfig.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.8)
4
- * Packaged: 2016-06-23T10:40:00+00:00
5
- * Last Modified: 2016-06-01T14:02:28+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Environmentconfig.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.9)
4
+ * Packaged: 2016-07-26T14:17:00+00:00
5
+ * Last Modified: 2016-06-23T10:40:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Environmentconfig.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/Model/Handledata.php ADDED
@@ -0,0 +1,21 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Product: Pb_Pbgsp (1.3.9)
4
+ * Packaged: 2016-07-26T14:17:00+00:00
5
+ * Last Modified: 2016-06-23T10:40:00+00:00
6
+ * File: app/code/local/Pb/Pbgsp/Model/Handlingoptions.php
7
+ * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
+ */
9
+ class Pb_Pbgsp_Model_Handledata{
10
+
11
+ public function toOptionArray()
12
+ {
13
+ return array(
14
+ array('value'=>1, 'label'=>'Per Order'),
15
+ array('value'=>2, 'label'=>'Per Item'),
16
+
17
+ );
18
+
19
+
20
+ }
21
+ }
app/code/local/Pb/Pbgsp/Model/Handlingoptions.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.8)
4
- * Packaged: 2016-06-23T10:40:00+00:00
5
- * Last Modified: 2016-06-01T14:02:28+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Handlingoptions.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.9)
4
+ * Packaged: 2016-07-26T14:17:00+00:00
5
+ * Last Modified: 2016-06-23T10:40:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Handlingoptions.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/Model/Helper.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.8)
4
- * Packaged: 2016-06-23T10:40:00+00:00
5
- * Last Modified: 2016-06-01T14:02:28+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Helper.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.9)
4
+ * Packaged: 2016-07-26T14:17:00+00:00
5
+ * Last Modified: 2016-06-23T10:40:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Helper.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/Model/Inboundparcel.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.8)
4
- * Packaged: 2016-06-23T10:40:00+00:00
5
- * Last Modified: 2016-06-01T14:02:28+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Inboundparcel.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.9)
4
+ * Packaged: 2016-07-26T14:17:00+00:00
5
+ * Last Modified: 2016-06-23T10:40:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Inboundparcel.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/Model/Invoice/Duty.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.8)
4
- * Packaged: 2016-06-23T10:40:00+00:00
5
- * Last Modified: 2016-06-01T14:02:28+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Invoice/Duty.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.9)
4
+ * Packaged: 2016-07-26T14:17:00+00:00
5
+ * Last Modified: 2016-06-23T10:40:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Invoice/Duty.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/Model/Messages.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.8)
4
- * Packaged: 2016-06-23T10:40:00+00:00
5
- * Last Modified: 2016-06-01T14:02:28+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Messages.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.9)
4
+ * Packaged: 2016-07-26T14:17:00+00:00
5
+ * Last Modified: 2016-06-23T10:40:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Messages.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/Model/Mysql4/Inboundparcel.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.8)
4
- * Packaged: 2016-06-23T10:40:00+00:00
5
- * Last Modified: 2016-06-01T14:02:28+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Mysql4/Inboundparcel.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.9)
4
+ * Packaged: 2016-07-26T14:17:00+00:00
5
+ * Last Modified: 2016-06-23T10:40:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Mysql4/Inboundparcel.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/Model/Mysql4/Inboundparcel/Collection.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.8)
4
- * Packaged: 2016-06-23T10:40:00+00:00
5
- * Last Modified: 2016-06-01T14:02:28+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Mysql4/Inboundparcel/Collection.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.9)
4
+ * Packaged: 2016-07-26T14:17:00+00:00
5
+ * Last Modified: 2016-06-23T10:40:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Mysql4/Inboundparcel/Collection.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/Model/Mysql4/Ordernumber.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.8)
4
- * Packaged: 2016-06-23T10:40:00+00:00
5
- * Last Modified: 2016-06-01T14:02:28+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Mysql4/Ordernumber.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.9)
4
+ * Packaged: 2016-07-26T14:17:00+00:00
5
+ * Last Modified: 2016-06-23T10:40:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Mysql4/Ordernumber.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/Model/Mysql4/Ordernumber/Collection.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.8)
4
- * Packaged: 2016-06-23T10:40:00+00:00
5
- * Last Modified: 2016-06-01T14:02:28+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Mysql4/Ordernumber/Collection.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.9)
4
+ * Packaged: 2016-07-26T14:17:00+00:00
5
+ * Last Modified: 2016-06-23T10:40:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Mysql4/Ordernumber/Collection.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/Model/Mysql4/Variable.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.8)
4
- * Packaged: 2016-06-23T10:40:00+00:00
5
- * Last Modified: 2016-06-01T14:02:28+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Mysql4/Variable.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.9)
4
+ * Packaged: 2016-07-26T14:17:00+00:00
5
+ * Last Modified: 2016-06-23T10:40:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Mysql4/Variable.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/Model/Mysql4/Variable/Collection.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.8)
4
- * Packaged: 2016-06-23T10:40:00+00:00
5
- * Last Modified: 2016-06-01T14:02:28+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Mysql4/Variable/Collection.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.9)
4
+ * Packaged: 2016-07-26T14:17:00+00:00
5
+ * Last Modified: 2016-06-23T10:40:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Mysql4/Variable/Collection.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/Model/Newhandlingoptions.php ADDED
@@ -0,0 +1,21 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Product: Pb_Pbgsp (1.3.9)
4
+ * Packaged: 2016-07-26T14:17:00+00:00
5
+ * Last Modified: 2016-06-23T10:40:00+00:00
6
+ * File: app/code/local/Pb/Pbgsp/Model/Handlingoptions.php
7
+ * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
+ */
9
+ class Pb_Pbgsp_Model_Newhandlingoptions {
10
+
11
+ public function toOptionArray()
12
+ {
13
+ return array(
14
+ array('value'=>1, 'label'=>'Per Order'),
15
+ array('value'=>2, 'label'=>'Per Item'),
16
+
17
+ );
18
+
19
+
20
+ }
21
+ }
app/code/local/Pb/Pbgsp/Model/Observer.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.8)
4
- * Packaged: 2016-06-23T10:40:00+00:00
5
- * Last Modified: 2016-06-01T14:02:28+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Observer.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.9)
4
+ * Packaged: 2016-07-26T14:17:00+00:00
5
+ * Last Modified: 2016-06-23T10:40:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Observer.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/Model/Ordernumber.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.8)
4
- * Packaged: 2016-06-23T10:40:00+00:00
5
- * Last Modified: 2016-06-01T14:02:28+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Ordernumber.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.9)
4
+ * Packaged: 2016-07-26T14:17:00+00:00
5
+ * Last Modified: 2016-06-23T10:40:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Ordernumber.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/Model/Pdf/Tax.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.8)
4
- * Packaged: 2016-06-23T10:40:00+00:00
5
- * Last Modified: 2016-06-01T14:02:28+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Pdf/Tax.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.9)
4
+ * Packaged: 2016-07-26T14:17:00+00:00
5
+ * Last Modified: 2016-06-23T10:40:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Pdf/Tax.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/Model/Productattributesource/Productconditions.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.8)
4
- * Packaged: 2016-06-23T10:40:00+00:00
5
- * Last Modified: 2016-06-01T14:02:28+00:00
6
 
7
  */
8
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.9)
4
+ * Packaged: 2016-07-26T14:17:00+00:00
5
+ * Last Modified: 2016-06-23T10:40:00+00:00
6
 
7
  */
8
 
app/code/local/Pb/Pbgsp/Model/Quote/Duty.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.8)
4
- * Packaged: 2016-06-23T10:40:00+00:00
5
- * Last Modified: 2016-06-01T14:02:28+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Quote/Duty.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.9)
4
+ * Packaged: 2016-07-26T14:17:00+00:00
5
+ * Last Modified: 2016-06-23T10:40:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Quote/Duty.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/Model/Resource/Mysql4/Setup.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.8)
4
- * Packaged: 2016-06-23T10:40:00+00:00
5
- * Last Modified: 2016-06-01T14:02:28+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Resource/Mysql4/Setup.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.9)
4
+ * Packaged: 2016-07-26T14:17:00+00:00
5
+ * Last Modified: 2016-06-23T10:40:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Resource/Mysql4/Setup.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/Model/Sales/Order/Shipment.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.8)
4
- * Packaged: 2016-06-23T10:40:00+00:00
5
- * Last Modified: 2016-06-01T14:02:28+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Sales/Order/Shipment.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.9)
4
+ * Packaged: 2016-07-26T14:17:00+00:00
5
+ * Last Modified: 2016-06-23T10:40:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Sales/Order/Shipment.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/Model/Util.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.8)
4
- * Packaged: 2016-06-23T10:40:00+00:00
5
- * Last Modified: 2016-06-01T14:02:28+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Util.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
@@ -48,6 +48,21 @@ class Pb_Pbgsp_Model_Util {
48
  return false;
49
 
50
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
51
  }
52
 
53
  ?>
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.9)
4
+ * Packaged: 2016-07-26T14:17:00+00:00
5
+ * Last Modified: 2016-06-23T10:40:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Util.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
48
  return false;
49
 
50
  }
51
+
52
+ public static function chopString($str, $len) {
53
+ $end = $len;
54
+ $lastFour = substr($str,$end - strlen("&amp"),strlen("&amp"));
55
+ $pos = strpos($lastFour,"&");
56
+ if (!($pos === FALSE)) {
57
+ $end = $end - strlen("&amp") + $pos;
58
+ }
59
+ $ret = substr($str,0,$end);
60
+ return $ret;
61
+ }
62
+
63
+ public static function stripHtml($text) {
64
+ return preg_replace("/<\s*\/\s*\w\s*.*?>|<\s*br\s*>/",'',preg_replace("/<\s*\w.*?>/", '', $text));
65
+ }
66
  }
67
 
68
  ?>
app/code/local/Pb/Pbgsp/Model/Variable.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.8)
4
- * Packaged: 2016-06-23T10:40:00+00:00
5
- * Last Modified: 2016-06-01T14:02:28+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Variable.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.9)
4
+ * Packaged: 2016-07-26T14:17:00+00:00
5
+ * Last Modified: 2016-06-23T10:40:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/Model/Variable.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/controllers/Adminhtml/CategorysettingsController.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.8)
4
- * Packaged: 2016-06-23T10:40:00+00:00
5
- * Last Modified: 2016-06-01T14:02:28+00:00
6
  */
7
 
8
  class Pb_Pbgsp_Adminhtml_CategorysettingsController extends Mage_Adminhtml_Controller_Action {
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.9)
4
+ * Packaged: 2016-07-26T14:17:00+00:00
5
+ * Last Modified: 2016-06-23T10:40:00+00:00
6
  */
7
 
8
  class Pb_Pbgsp_Adminhtml_CategorysettingsController extends Mage_Adminhtml_Controller_Action {
app/code/local/Pb/Pbgsp/data/pb_pbgsp_setup/data-install-1.0.0.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.8)
4
- * Packaged: 2016-06-23T10:40:00+00:00
5
- * Last Modified: 2016-06-01T14:02:28+00:00
6
  * File: app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.9)
4
+ * Packaged: 2016-07-26T14:17:00+00:00
5
+ * Last Modified: 2016-06-23T10:40:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <Pb_Pbgsp>
5
- <version>1.3.8</version>
6
  </Pb_Pbgsp>
7
  </modules>
8
  <global>
2
  <config>
3
  <modules>
4
  <Pb_Pbgsp>
5
+ <version>1.3.9</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.3.8)
4
- * Packaged: 2016-06-23T10:40:00+00:00
5
- * Last Modified: 2016-06-01T14:02:28+00:00
6
  * File: app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.9)
4
+ * Packaged: 2016-07-26T14:17:00+00:00
5
+ * Last Modified: 2016-06-23T10:40:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.0.0-1.0.1.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.8)
4
- * Packaged: 2016-06-23T10:40:00+00:00
5
- * Last Modified: 2016-06-01T14:02:28+00:00
6
  * File: app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.9)
4
+ * Packaged: 2016-07-26T14:17:00+00:00
5
+ * Last Modified: 2016-06-23T10:40:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.1.1-1.1.2.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.8)
4
- * Packaged: 2016-06-23T10:40:00+00:00
5
- * Last Modified: 2016-06-01T14:02:28+00:00
6
  * File: app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.9)
4
+ * Packaged: 2016-07-26T14:17:00+00:00
5
+ * Last Modified: 2016-06-23T10:40:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.2.0-1.2.1.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.8)
4
- * Packaged: 2016-06-23T10:40:00+00:00
5
- * Last Modified: 2016-06-01T14:02:28+00:00
6
  * File: app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.9)
4
+ * Packaged: 2016-07-26T14:17:00+00:00
5
+ * Last Modified: 2016-06-23T10:40:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.3.0-1.3.1.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.8)
4
- * Packaged: 2016-06-23T10:40:00+00:00
5
- * Last Modified: 2016-06-01T14:02:28+00:00
6
  * File: app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.9)
4
+ * Packaged: 2016-07-26T14:17:00+00:00
5
+ * Last Modified: 2016-06-23T10:40:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.3.5-1.3.6.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.8)
4
- * Packaged: 2016-06-23T10:40:00+00:00
5
- * Last Modified: 2016-06-01T14:02:28+00:00
6
  * File: app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.9)
4
+ * Packaged: 2016-07-26T14:17:00+00:00
5
+ * Last Modified: 2016-06-23T10:40:00+00:00
6
  * File: app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php
7
  * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>pitneybowes_gsp</name>
4
- <version>1.3.8</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,13 +22,11 @@ Providing full international tracking linked from your admin page&#xD;
22
  &lt;/ul&gt;&#xD;
23
  To learn more, go to &lt;a href="http://www.pb.com/ecom"&gt;http://www.pb.com/ecom&lt;/a&gt;&#xD;
24
  </description>
25
- <notes>1. Fixed issue when customer uses paypal express checkout on product page or cart page. Added config to include merchant customer service phone number that will be included in paypal checkout process o avoid erring on api call.&#xD;
26
- &#xD;
27
- 2. Added compatibility with Shipstation. Updated create ASN on tracking number creation to work with Shipstation API</notes>
28
  <authors><author><name>Shane Bogdan</name><user>pbecommerce</user><email>shane.bogdan@pb.com</email></author></authors>
29
- <date>2016-06-23</date>
30
- <time>15:06:24</time>
31
- <contents><target name="magelocal"><dir name="Pb"><dir name="Pbgsp"><dir name="Block"><dir name="Adminhtml"><dir name="Categorysettings"><file name="Grid.php" hash="ef8f558e57ce99bf6b9876a148c6a29e"/></dir><file name="Categorysettings.php" hash="c30f745daf0e9b3c9995f476fbf9d2a8"/><dir name="Sales"><dir name="Order"><dir name="Invoice"><file name="Totals.php" hash="99ea1396e82ffc7860761f6587c011b1"/></dir><file name="Totals.php" hash="309c4168bbbe7cc14c03f162f619481b"/></dir></dir><file name="Version.php" hash="a4ea3b7d4c3d75f51fc667f46468b179"/></dir><dir name="Checkout"><dir name="Shipping"><dir name="Method"><file name="Available.php" hash="5f3cd250b969ccb4365750d63016888f"/></dir></dir></dir><file name="Form.php" hash="6b506ea1c96a0a02548cfe932143db21"/><dir name="Sales"><dir name="Order"><dir name="Invoice"><file name="Totals.php" hash="ad5ac87312f8ccf73f599f0b2ca33497"/></dir><file name="Totals.php" hash="9bf820111589184d4b0c61fa8dccd700"/></dir></dir><dir name="Tax"><dir name="Checkout"><file name="Tax.php" hash="af6324182eed027311f5ceacddcf5d55"/></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="001879f53ac6c8b8ffa5764b32f6c6e6"/></dir><dir name="Model"><file name="Api.php" hash="055368083ef636d066e4c00b88d49b89"/><dir name="Carrier"><file name="ShippingMethod.php" hash="2f6359cd6363438dd7a5ad8ff8433be5"/></dir><dir name="Catalog"><file name="Category.php" hash="1d700b14d1d3205f4b0d82d43b0ae69d"/><file name="Cron.php" hash="4bfc42be16fcb8e66b99b096573dc58a"/><file name="File.php" hash="96b577552a1b074a98e3024901cbba57"/><file name="Product.php" hash="527a73fd76a46fc71ecebc19633af82f"/></dir><file name="Credentials.php" hash="95c01358b5044c52716aad8c90ae1bea"/><dir name="Creditmemo"><file name="Duty.php" hash="bdf94c762131397d53b2fda3cf77e92f"/></dir><file name="Environmentconfig.php" hash="93f8834d6a454ae706fa8484fd934a75"/><file name="Handlingoptions.php" hash="c57eb321ef5c5de138dd118d783f8e62"/><file name="Helper.php" hash="2cc8cd25e89abb2bc83195eb7f5d731e"/><file name="Inboundparcel.php" hash="9f480fcbe5720ea57db70a05e418dcdf"/><dir name="Invoice"><file name="Duty.php" hash="d34be6359cd5f82af314e3d124f4366b"/></dir><file name="Messages.php" hash="6f9843ad06b8fa355decb33afaa3e016"/><dir name="Mysql4"><dir name="Inboundparcel"><file name="Collection.php" hash="62ece29337b349756560f564fa996a56"/></dir><file name="Inboundparcel.php" hash="9a206c532453725678d6b670e1aefb8c"/><dir name="Ordernumber"><file name="Collection.php" hash="088c6fc2e2c7b26ea8cc46ff88e6e3aa"/></dir><file name="Ordernumber.php" hash="ed42d4eed2de868af0662be62d25cea2"/><dir name="Variable"><file name="Collection.php" hash="7177edcd336b9677ebfea80a150e527c"/></dir><file name="Variable.php" hash="050b0b97b7de7759fd8e42d07650477d"/></dir><file name="Observer.php" hash="89eeb2de78f5443d075f1e46db4d644f"/><file name="Ordernumber.php" hash="6a59de5cb51a29c09fd7fabca1088350"/><dir name="Pdf"><file name="Tax.php" hash="1d36fa9a88512ef7f9ffea79a49bdf96"/></dir><dir name="Productattributesource"><file name="Productconditions.php" hash="069a0ca8c773f4975dcadcce11bb150f"/></dir><dir name="Quote"><file name="Duty.php" hash="85d4dd0f55194d51cb67fa832277e387"/></dir><dir name="Resource"><dir name="Mysql4"><file name="Setup.php" hash="38b11715670042285100b088a589bcc3"/></dir></dir><dir name="Sales"><dir name="Order"><file name="Shipment.php" hash="936a3be2fb571279bcd66499c0830b53"/></dir></dir><file name="Util.php" hash="592bec94b85e452187f9f0ee1466933f"/><file name="Variable.php" hash="629dd5ccebe55c2106f0d3b10ced2abf"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="CategorysettingsController.php" hash="acee23a9e1263e7f534d3745eb667b1d"/></dir></dir><dir name="data"><dir name="pb_pbgsp_setup"><file name="data-install-1.0.0.php" hash="2680a3431079c09db99776203e457915"/></dir></dir><dir name="etc"><file name="config.xml" hash="b6ee7df5783761f7edf054dbdf58eeb1"/><file name="system.xml" hash="1c023bc8dcc57fc2bfdb09e633baa9f1"/></dir><dir name="sql"><dir name="pbgsp_setup"><file name="mysql4-install-1.0.0.php" hash="18798c26e8533477eee034c3bba330d0"/><file name="mysql4-upgrade-1.0.0-1.0.1.php" hash="676f4b15355ec76d5357426e8d7d5e0b"/><file name="mysql4-upgrade-1.1.1-1.1.2.php" hash="ce70ed13f9b1ba0167030078e4dd0045"/><file name="mysql4-upgrade-1.2.0-1.2.1.php" hash="cf9532c44443b501cd82fffa547b01d3"/><file name="mysql4-upgrade-1.3.0-1.3.1.php" hash="5916388eaed4fab2d8963b97a666b6cf"/><file name="mysql4-upgrade-1.3.5-1.3.6.php" hash="cbe5f30b64236520850d15da41121302"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Pb_Pbgsp.xml" hash="8475d60d4719f8ea7761a4ca39016e48"/></dir></target><target name="magelocale"><dir name="en_US"><file name="Pb_Clearpath.csv" hash="aa4b7a650feb1709a34b6c053b56811c"/><dir name="template"><dir name="email"><file name="pbgsp_shipment_new.html" hash="0fb628e37654a9768babe0ed06df4960"/></dir></dir></dir></target><target name="mageweb"><dir name="."><file name="ReadMe.txt" hash="d41d8cd98f00b204e9800998ecf8427e"/><file name="PBGSP_Manual_Catalog_Export.php" hash="d41d8cd98f00b204e9800998ecf8427e"/></dir></target></contents>
32
  <compatible/>
33
  <dependencies><required><php><min>5.1.0</min><max>5.6.10</max></php></required></dependencies>
34
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>pitneybowes_gsp</name>
4
+ <version>1.3.9</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License (OSL)</license>
7
  <channel>community</channel>
22
  &lt;/ul&gt;&#xD;
23
  To learn more, go to &lt;a href="http://www.pb.com/ecom"&gt;http://www.pb.com/ecom&lt;/a&gt;&#xD;
24
  </description>
25
+ <notes>1. Modified product URL in catalog export CSV file to accurately link to the product and categories in the store.</notes>
 
 
26
  <authors><author><name>Shane Bogdan</name><user>pbecommerce</user><email>shane.bogdan@pb.com</email></author></authors>
27
+ <date>2016-07-26</date>
28
+ <time>18:26:36</time>
29
+ <contents><target name="magelocal"><dir name="Pb"><dir name="Pbgsp"><dir name="Block"><dir name="Adminhtml"><dir name="Categorysettings"><file name="Grid.php" hash="7831a76a02fee52946223ec6d99a36ef"/></dir><file name="Categorysettings.php" hash="e84b5fd49ce42a23b16cf6c910c6d93a"/><dir name="Sales"><dir name="Order"><dir name="Invoice"><file name="Totals.php" hash="ac60016d5ebe1478d47be7f2f9678f4a"/></dir><file name="Totals.php" hash="d1ca93c7edd40f0557597429026c88d6"/></dir></dir><file name="Version.php" hash="3cfa4694f7c549897222005f3013ce0e"/></dir><dir name="Checkout"><dir name="Shipping"><dir name="Method"><file name="Available.php" hash="45752803ec9303a6870254c0d5dd82c8"/></dir></dir></dir><file name="Form.php" hash="8b7bf315c84e3d6eb52550fba4951afd"/><dir name="Sales"><dir name="Order"><dir name="Invoice"><file name="Totals.php" hash="95ef2e3d0732f85d82ecb29431827e51"/></dir><file name="Totals.php" hash="188b66257bb641b64c2fbb503f3054c0"/></dir></dir><dir name="Tax"><dir name="Checkout"><file name="Tax.php" hash="82cabfcf0a9174ef8d0e162cf29efa22"/></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="410cf03df8b2f5365832fb12e828056b"/></dir><dir name="Model"><file name="Api.php" hash="20ae2864292032245a2dd021929c157d"/><dir name="Carrier"><file name="ShippingMethod.php" hash="8d2b47b23054333ab5cd4e1fc57e7976"/></dir><dir name="Catalog"><file name="Category.php" hash="e02c025715fb3ba73658b22b0a7b521d"/><file name="Cron.php" hash="376093a4268d132511805bab54f712c7"/><file name="File.php" hash="6bd7969e7eb6ef937b146ea38a3811fe"/><file name="Product.php" hash="cc043989726e9c430c3f8a9a9626dfe7"/></dir><file name="Credentials.php" hash="669dde040685706ee6d350c1f63add7e"/><dir name="Creditmemo"><file name="Duty.php" hash="ef8547c29b04a9f3a8dcccab3b03758b"/></dir><file name="Environmentconfig.php" hash="5c5a93a868cb493da81a3e91a57cb6ab"/><file name="Handledata.php" hash="06e442ee3e72552160023dbb5743843f"/><file name="Handlingoptions.php" hash="6c10c163689502cf45acdd755600db90"/><file name="Helper.php" hash="fad4152b99507e76790c4551c56d4c72"/><file name="Inboundparcel.php" hash="321f4841719217bdb22dc9730f684785"/><dir name="Invoice"><file name="Duty.php" hash="a6baaacc560d73a5686e9d820476107a"/></dir><file name="Messages.php" hash="ec2fa5e57ff736480072a8684c702556"/><dir name="Mysql4"><dir name="Inboundparcel"><file name="Collection.php" hash="9b161bb0ca5240ae7a405930521748e4"/></dir><file name="Inboundparcel.php" hash="bc1732cc2b6c417a2d15db5481d04440"/><dir name="Ordernumber"><file name="Collection.php" hash="d165cf8bbeac9fae5c0bede4956a6928"/></dir><file name="Ordernumber.php" hash="074f8c8b2844b18d6cb90d6850a8dc58"/><dir name="Variable"><file name="Collection.php" hash="3917604c98cc41f75757434b08381793"/></dir><file name="Variable.php" hash="88593c4918f2ac6c1cd7af890dbaf30e"/></dir><file name="Newhandlingoptions.php" hash="4d717a0cceea9ce5b850d501cdfc7ba2"/><file name="Observer.php" hash="26142df3e82c89ebacb56f3f2bd60074"/><file name="Ordernumber.php" hash="ffac215d922bd9a0c13f024c745da16f"/><dir name="Pdf"><file name="Tax.php" hash="ef938c75dd28d16c94760b8084d993b9"/></dir><dir name="Productattributesource"><file name="Productconditions.php" hash="634de5503a12393fc4d7c02c5878bbb3"/></dir><dir name="Quote"><file name="Duty.php" hash="c9bf1384094002a281a3de2cbaeb1db7"/></dir><dir name="Resource"><dir name="Mysql4"><file name="Setup.php" hash="0d4428e47e8946ce16977377cac9e7ad"/></dir></dir><dir name="Sales"><dir name="Order"><file name="Shipment.php" hash="a6a62c3e0df0e1a39b9735606bda3224"/></dir></dir><file name="Util.php" hash="e0ac6951df8b4f32943089a57899b7b0"/><file name="Variable.php" hash="f82c293ac24b02cbf72bde54fb466ec9"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="CategorysettingsController.php" hash="9610e118dcc7335397366cffc4ff9196"/></dir></dir><dir name="data"><dir name="pb_pbgsp_setup"><file name="data-install-1.0.0.php" hash="7dd0bdbbe8691c5b9edae74244adce68"/></dir></dir><dir name="etc"><file name="config.xml" hash="c34f8a61ab93ec529601e0306f23c246"/><file name="system.xml" hash="1c023bc8dcc57fc2bfdb09e633baa9f1"/></dir><dir name="sql"><dir name="pbgsp_setup"><file name="mysql4-install-1.0.0.php" hash="ae3bf2e4d25b1cc9799055021b6878a1"/><file name="mysql4-upgrade-1.0.0-1.0.1.php" hash="887bad2a6de8132f867c88a871be5950"/><file name="mysql4-upgrade-1.1.1-1.1.2.php" hash="7670bb817f53a4dccc428df2478a5f18"/><file name="mysql4-upgrade-1.2.0-1.2.1.php" hash="f5ca6fbe858744362f209e4b6af1add5"/><file name="mysql4-upgrade-1.3.0-1.3.1.php" hash="df44fd4120498fa514ab8a5ab55f7e1e"/><file name="mysql4-upgrade-1.3.5-1.3.6.php" hash="082e7f2a27e65055707ba8b9932b6d39"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Pb_Pbgsp.xml" hash="8475d60d4719f8ea7761a4ca39016e48"/></dir></target><target name="magelocale"><dir name="en_US"><file name="Pb_Clearpath.csv" hash="aa4b7a650feb1709a34b6c053b56811c"/><dir name="template"><dir name="email"><file name="pbgsp_shipment_new.html" hash="0fb628e37654a9768babe0ed06df4960"/></dir></dir></dir></target><target name="mageweb"><dir name="."><file name="ReadMe.txt" hash="d41d8cd98f00b204e9800998ecf8427e"/><file name="PBGSP_Manual_Catalog_Export.php" hash="d41d8cd98f00b204e9800998ecf8427e"/></dir></target></contents>
30
  <compatible/>
31
  <dependencies><required><php><min>5.1.0</min><max>5.6.10</max></php></required></dependencies>
32
  </package>