Version Notes
Patch release for Magento Connect.
1. Integrated validation for title field in configuration page to resolve PHP 5.3 will warning when there is an empty string
2. Added a cron job to check for shipped PB orders that have no ASNs (tracking numbers) and attempt to create.
Download this release
Release Info
Developer | Raymond Lai |
Extension | pitneybowes_gsp |
Version | 1.1.2 |
Comparing to | |
See all releases |
Code changes from version 1.1.1 to 1.1.2
- ReadMe.txt +8 -0
- app/code/local/Pb/Pbgsp/Block/Adminhtml/Sales/Order/Invoice/Totals.php +3 -3
- app/code/local/Pb/Pbgsp/Block/Adminhtml/Sales/Order/Totals.php +3 -3
- app/code/local/Pb/Pbgsp/Block/Checkout/Shipping/Method/Available.php +3 -3
- app/code/local/Pb/Pbgsp/Block/Form.php +3 -3
- app/code/local/Pb/Pbgsp/Block/Sales/Order/Invoice/Totals.php +3 -3
- app/code/local/Pb/Pbgsp/Block/Sales/Order/Totals.php +3 -3
- app/code/local/Pb/Pbgsp/Model/Api.php +43 -12
- app/code/local/Pb/Pbgsp/Model/Authapioptions.php +22 -0
- app/code/local/Pb/Pbgsp/Model/Carrier/ShippingMethod.php +3 -3
- app/code/local/Pb/Pbgsp/Model/Catalog/Category.php +3 -3
- app/code/local/Pb/Pbgsp/Model/Catalog/Cron.php +3 -3
- app/code/local/Pb/Pbgsp/Model/Catalog/File.php +3 -3
- app/code/local/Pb/Pbgsp/Model/Catalog/Product.php +3 -3
- app/code/local/Pb/Pbgsp/Model/Credentials.php +3 -3
- app/code/local/Pb/Pbgsp/Model/Creditmemo/Duty.php +3 -3
- app/code/local/Pb/Pbgsp/Model/Handlingoptions.php +3 -3
- app/code/local/Pb/Pbgsp/Model/Helper.php +3 -3
- app/code/local/Pb/Pbgsp/Model/Inboundparcel.php +101 -3
- app/code/local/Pb/Pbgsp/Model/Invoice/Duty.php +3 -3
- app/code/local/Pb/Pbgsp/Model/Messages.php +3 -3
- app/code/local/Pb/Pbgsp/Model/Mysql4/Inboundparcel.php +3 -3
- app/code/local/Pb/Pbgsp/Model/Mysql4/Inboundparcel/Collection.php +3 -3
- app/code/local/Pb/Pbgsp/Model/Mysql4/Ordernumber.php +3 -3
- app/code/local/Pb/Pbgsp/Model/Mysql4/Ordernumber/Collection.php +3 -3
- app/code/local/Pb/Pbgsp/Model/Mysql4/Variable.php +3 -3
- app/code/local/Pb/Pbgsp/Model/Mysql4/Variable/Collection.php +3 -3
- app/code/local/Pb/Pbgsp/Model/Observer.php +25 -5
- app/code/local/Pb/Pbgsp/Model/Ordernumber.php +3 -3
- app/code/local/Pb/Pbgsp/Model/Pdf/Tax.php +3 -3
- app/code/local/Pb/Pbgsp/Model/Quote/Duty.php +3 -3
- app/code/local/Pb/Pbgsp/Model/Resource/Mysql4/Setup.php +3 -3
- app/code/local/Pb/Pbgsp/Model/Sales/Order/Shipment.php +3 -3
- app/code/local/Pb/Pbgsp/Model/Util.php +3 -3
- app/code/local/Pb/Pbgsp/Model/Variable.php +3 -3
- app/code/local/Pb/Pbgsp/data/pb_pbgsp_setup/data-install-1.0.0.php +3 -3
- app/code/local/Pb/Pbgsp/etc/config.xml +10 -1
- app/code/local/Pb/Pbgsp/etc/system.xml +446 -442
- app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php +3 -3
- app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.0.0-1.0.1.php +3 -3
- app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.1.1-1.1.2.php +28 -0
- package.xml +7 -5
ReadMe.txt
CHANGED
@@ -31,6 +31,14 @@ In order to take advantage of the file encryption setting in the extension confi
|
|
31 |
========================================================
|
32 |
CHANGELOG
|
33 |
========================================================
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
34 |
v. 1.1.1
|
35 |
|
36 |
Corrected currency conversion logic to not request rate from PB but run conversion directly in Magento
|
31 |
========================================================
|
32 |
CHANGELOG
|
33 |
========================================================
|
34 |
+
|
35 |
+
v. 1.1.2
|
36 |
+
|
37 |
+
Integrated validation for title field in configuration page to resolve PHP 5.3 will warning when there is an empty string
|
38 |
+
|
39 |
+
Added a cron job to check for shipped PB orders that have no ASNs (tracking numbers) and attempt to create.
|
40 |
+
|
41 |
+
|
42 |
v. 1.1.1
|
43 |
|
44 |
Corrected currency conversion logic to not request rate from PB but run conversion directly in Magento
|
app/code/local/Pb/Pbgsp/Block/Adminhtml/Sales/Order/Invoice/Totals.php
CHANGED
@@ -1,9 +1,9 @@
|
|
1 |
<?php
|
2 |
|
3 |
/**
|
4 |
-
* Product: Pb_Pbgsp (1.1.
|
5 |
-
* Packaged: 2015-09-
|
6 |
-
* Last Modified: 2015-09-
|
7 |
|
8 |
|
9 |
|
1 |
<?php
|
2 |
|
3 |
/**
|
4 |
+
* Product: Pb_Pbgsp (1.1.2)
|
5 |
+
* Packaged: 2015-09-23T12:09:53+00:00
|
6 |
+
* Last Modified: 2015-09-14T12:11:20+00:00
|
7 |
|
8 |
|
9 |
|
app/code/local/Pb/Pbgsp/Block/Adminhtml/Sales/Order/Totals.php
CHANGED
@@ -1,9 +1,9 @@
|
|
1 |
<?php
|
2 |
|
3 |
/**
|
4 |
-
* Product: Pb_Pbgsp (1.1.
|
5 |
-
* Packaged: 2015-09-
|
6 |
-
* Last Modified: 2015-09-
|
7 |
|
8 |
|
9 |
|
1 |
<?php
|
2 |
|
3 |
/**
|
4 |
+
* Product: Pb_Pbgsp (1.1.2)
|
5 |
+
* Packaged: 2015-09-23T12:09:53+00:00
|
6 |
+
* Last Modified: 2015-09-14T12:11:20+00:00
|
7 |
|
8 |
|
9 |
|
app/code/local/Pb/Pbgsp/Block/Checkout/Shipping/Method/Available.php
CHANGED
@@ -1,9 +1,9 @@
|
|
1 |
<?php
|
2 |
|
3 |
/**
|
4 |
-
* Product: Pb_Pbgsp (1.1.
|
5 |
-
* Packaged: 2015-09-
|
6 |
-
* Last Modified: 2015-09-
|
7 |
|
8 |
|
9 |
|
1 |
<?php
|
2 |
|
3 |
/**
|
4 |
+
* Product: Pb_Pbgsp (1.1.2)
|
5 |
+
* Packaged: 2015-09-23T12:09:53+00:00
|
6 |
+
* Last Modified: 2015-09-14T12:11:20+00:00
|
7 |
|
8 |
|
9 |
|
app/code/local/Pb/Pbgsp/Block/Form.php
CHANGED
@@ -1,8 +1,8 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
* Product: Pb_Pbgsp (1.1.
|
4 |
-
* Packaged: 2015-09-
|
5 |
-
* Last Modified: 2015-09-
|
6 |
|
7 |
|
8 |
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.1.2)
|
4 |
+
* Packaged: 2015-09-23T12:09:53+00:00
|
5 |
+
* Last Modified: 2015-09-14T12:11:20+00:00
|
6 |
|
7 |
|
8 |
|
app/code/local/Pb/Pbgsp/Block/Sales/Order/Invoice/Totals.php
CHANGED
@@ -1,9 +1,9 @@
|
|
1 |
<?php
|
2 |
|
3 |
/**
|
4 |
-
* Product: Pb_Pbgsp (1.1.
|
5 |
-
* Packaged: 2015-09-
|
6 |
-
* Last Modified: 2015-09-
|
7 |
|
8 |
|
9 |
|
1 |
<?php
|
2 |
|
3 |
/**
|
4 |
+
* Product: Pb_Pbgsp (1.1.2)
|
5 |
+
* Packaged: 2015-09-23T12:09:53+00:00
|
6 |
+
* Last Modified: 2015-09-14T12:11:20+00:00
|
7 |
|
8 |
|
9 |
|
app/code/local/Pb/Pbgsp/Block/Sales/Order/Totals.php
CHANGED
@@ -1,8 +1,8 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
* Product: Pb_Pbgsp (1.1.
|
4 |
-
* Packaged: 2015-09-
|
5 |
-
* Last Modified: 2015-09-
|
6 |
|
7 |
|
8 |
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.1.2)
|
4 |
+
* Packaged: 2015-09-23T12:09:53+00:00
|
5 |
+
* Last Modified: 2015-09-14T12:11:20+00:00
|
6 |
|
7 |
|
8 |
|
app/code/local/Pb/Pbgsp/Model/Api.php
CHANGED
@@ -1,8 +1,8 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
* Product: Pb_Pbgsp (1.1.
|
4 |
-
* Packaged: 2015-09-
|
5 |
-
* Last Modified: 2015-09-
|
6 |
|
7 |
|
8 |
|
@@ -74,6 +74,9 @@ class Pb_Pbgsp_Model_Api
|
|
74 |
Mage::getSingleton("customer/session")->setPbToken(false);
|
75 |
self::CallAPI($method,$url,$data,true);
|
76 |
}
|
|
|
|
|
|
|
77 |
else {
|
78 |
throw new Exception($result,$status);
|
79 |
}
|
@@ -282,13 +285,21 @@ class Pb_Pbgsp_Model_Api
|
|
282 |
foreach($shipment->getTracksCollection() as $track) {
|
283 |
$tracks[] = $track;
|
284 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
285 |
$requestBody = array(
|
286 |
'merchantOrderNumber' => $cpOrderNumber,
|
287 |
-
'parcelIdentificationNumber' => $
|
288 |
'inboundParcelCommodities' => $inboundParcelCommodities,
|
289 |
-
'shipper' => $
|
290 |
'shipperService' => 'EXPRESS',
|
291 |
-
'shipperTrackingNumber'=> $
|
292 |
'dcId' => '211113442',
|
293 |
'dcAddress' => array(
|
294 |
'street1' => '200 Main Street',
|
@@ -324,10 +335,19 @@ class Pb_Pbgsp_Model_Api
|
|
324 |
);
|
325 |
$url = Pb_Pbgsp_Model_Credentials::getOrderMgmtAPIUrl().'/orders/'.
|
326 |
$cpOrderNumber.'/inbound-parcels';
|
327 |
-
|
328 |
-
|
329 |
-
|
330 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
331 |
return $parcelResponse;
|
332 |
|
333 |
}
|
@@ -408,13 +428,24 @@ class Pb_Pbgsp_Model_Api
|
|
408 |
$cancelOrderResponse = json_decode($response,true);
|
409 |
Pb_Pbgsp_Model_Util::log('Response of cancel order');
|
410 |
Pb_Pbgsp_Model_Util::log($cancelOrderResponse);
|
411 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
412 |
|
413 |
}
|
414 |
catch(Exception $e) {
|
415 |
Pb_Pbgsp_Model_Util::log("Received unexpected exception from Pb while calling cancel Order.");
|
416 |
Pb_Pbgsp_Model_Util::logException($e);
|
417 |
-
|
418 |
|
419 |
}
|
420 |
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.1.2)
|
4 |
+
* Packaged: 2015-09-23T12:09:53+00:00
|
5 |
+
* Last Modified: 2015-09-14T12:11:20+00:00
|
6 |
|
7 |
|
8 |
|
74 |
Mage::getSingleton("customer/session")->setPbToken(false);
|
75 |
self::CallAPI($method,$url,$data,true);
|
76 |
}
|
77 |
+
if($status == 404){
|
78 |
+
return $result;
|
79 |
+
}
|
80 |
else {
|
81 |
throw new Exception($result,$status);
|
82 |
}
|
285 |
foreach($shipment->getTracksCollection() as $track) {
|
286 |
$tracks[] = $track;
|
287 |
}
|
288 |
+
|
289 |
+
if(isset($tracks[0])){
|
290 |
+
$number=$tracks[0]->getNumber();
|
291 |
+
$title = $tracks[0]->getTitle();
|
292 |
+
}else{
|
293 |
+
$number = '123456';
|
294 |
+
$title = 'PB';
|
295 |
+
}
|
296 |
$requestBody = array(
|
297 |
'merchantOrderNumber' => $cpOrderNumber,
|
298 |
+
'parcelIdentificationNumber' => $number,
|
299 |
'inboundParcelCommodities' => $inboundParcelCommodities,
|
300 |
+
'shipper' => $title,
|
301 |
'shipperService' => 'EXPRESS',
|
302 |
+
'shipperTrackingNumber'=> $number,
|
303 |
'dcId' => '211113442',
|
304 |
'dcAddress' => array(
|
305 |
'street1' => '200 Main Street',
|
335 |
);
|
336 |
$url = Pb_Pbgsp_Model_Credentials::getOrderMgmtAPIUrl().'/orders/'.
|
337 |
$cpOrderNumber.'/inbound-parcels';
|
338 |
+
|
339 |
+
$tryCnt = 1;
|
340 |
+
do
|
341 |
+
{
|
342 |
+
$response = self::CallAPI('POST',$url,$requestBody);
|
343 |
+
$parcelResponse = json_decode($response,true);
|
344 |
+
|
345 |
+
Pb_Pbgsp_Model_Util::log('Response of inbound-parcels try'.$tryCnt);
|
346 |
+
Pb_Pbgsp_Model_Util::log($parcelResponse);
|
347 |
+
$tryCnt ++;
|
348 |
+
|
349 |
+
} while(($tryCnt <= 10) && (array_key_exists('errors',$parcelResponse)));
|
350 |
+
|
351 |
return $parcelResponse;
|
352 |
|
353 |
}
|
428 |
$cancelOrderResponse = json_decode($response,true);
|
429 |
Pb_Pbgsp_Model_Util::log('Response of cancel order');
|
430 |
Pb_Pbgsp_Model_Util::log($cancelOrderResponse);
|
431 |
+
if(array_key_exists('errors',$cancelOrderResponse)) {
|
432 |
+
Pb_Pbgsp_Model_Util::log("Error generating cancelling order");
|
433 |
+
Pb_Pbgsp_Model_Util::log($cancelOrderResponse);
|
434 |
+
foreach($cancelOrderResponse['errors'] as $error){
|
435 |
+
$errorCode= $error['error'];
|
436 |
+
$errorMessage .=$error['message']."</br>";
|
437 |
+
}
|
438 |
+
Mage::getSingleton('core/session')->addError('PB Error - '.$errorMessage);
|
439 |
+
}else{
|
440 |
+
return $cancelOrderResponse;
|
441 |
+
}
|
442 |
+
|
443 |
|
444 |
}
|
445 |
catch(Exception $e) {
|
446 |
Pb_Pbgsp_Model_Util::log("Received unexpected exception from Pb while calling cancel Order.");
|
447 |
Pb_Pbgsp_Model_Util::logException($e);
|
448 |
+
Mage::getSingleton('core/session')->addError('Unexpected exception from PB while calling cancel Order. '.$e->getMessage());
|
449 |
|
450 |
}
|
451 |
|
app/code/local/Pb/Pbgsp/Model/Authapioptions.php
ADDED
@@ -0,0 +1,22 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* Product: Pb_Pbgsp (1.1.2)
|
4 |
+
* Packaged: 2015-09-23T12:09:53+00:00
|
5 |
+
* Last Modified: 2015-09-14T12:11:20+00:00
|
6 |
+
|
7 |
+
|
8 |
+
|
9 |
+
|
10 |
+
* File: app/code/local/Pb/Pbgsp/Model/Handlingoptions.php
|
11 |
+
* Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
|
12 |
+
*/
|
13 |
+
class Pb_Pbgsp_Model_Authapioptions {
|
14 |
+
public function toOptionArray()
|
15 |
+
{
|
16 |
+
return array(
|
17 |
+
array('value'=>"Auth: https://cbs.ecommerce.pb.com/auth/token", 'label'=>'Production'),
|
18 |
+
array('value'=>"https://sandbox-cbs.ecommerce.pb.com/auth/token", 'label'=>'Sandbox'),
|
19 |
+
|
20 |
+
);
|
21 |
+
}
|
22 |
+
}
|
app/code/local/Pb/Pbgsp/Model/Carrier/ShippingMethod.php
CHANGED
@@ -1,9 +1,9 @@
|
|
1 |
<?php
|
2 |
|
3 |
/**
|
4 |
-
* Product: Pb_Pbgsp (1.1.
|
5 |
-
* Packaged: 2015-09-
|
6 |
-
* Last Modified: 2015-09-
|
7 |
|
8 |
|
9 |
|
1 |
<?php
|
2 |
|
3 |
/**
|
4 |
+
* Product: Pb_Pbgsp (1.1.2)
|
5 |
+
* Packaged: 2015-09-23T12:09:53+00:00
|
6 |
+
* Last Modified: 2015-09-14T12:11:20+00:00
|
7 |
|
8 |
|
9 |
|
app/code/local/Pb/Pbgsp/Model/Catalog/Category.php
CHANGED
@@ -1,8 +1,8 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
* Product: Pb_Pbgsp (1.1.
|
4 |
-
* Packaged: 2015-09-
|
5 |
-
* Last Modified: 2015-09-
|
6 |
|
7 |
|
8 |
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.1.2)
|
4 |
+
* Packaged: 2015-09-23T12:09:53+00:00
|
5 |
+
* Last Modified: 2015-09-14T12:11:20+00:00
|
6 |
|
7 |
|
8 |
|
app/code/local/Pb/Pbgsp/Model/Catalog/Cron.php
CHANGED
@@ -1,8 +1,8 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
* Product: Pb_Pbgsp (1.1.
|
4 |
-
* Packaged: 2015-09-
|
5 |
-
* Last Modified: 2015-09-
|
6 |
|
7 |
|
8 |
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.1.2)
|
4 |
+
* Packaged: 2015-09-23T12:09:53+00:00
|
5 |
+
* Last Modified: 2015-09-14T12:11:20+00:00
|
6 |
|
7 |
|
8 |
|
app/code/local/Pb/Pbgsp/Model/Catalog/File.php
CHANGED
@@ -1,9 +1,9 @@
|
|
1 |
<?php
|
2 |
|
3 |
/**
|
4 |
-
* Product: Pb_Pbgsp (1.1.
|
5 |
-
* Packaged: 2015-09-
|
6 |
-
* Last Modified: 2015-09-
|
7 |
|
8 |
|
9 |
* File: app/code/local/Pb/Pbgsp/Model/Catalog/File.php
|
1 |
<?php
|
2 |
|
3 |
/**
|
4 |
+
* Product: Pb_Pbgsp (1.1.2)
|
5 |
+
* Packaged: 2015-09-23T12:09:53+00:00
|
6 |
+
* Last Modified: 2015-09-14T12:11:20+00:00
|
7 |
|
8 |
|
9 |
* File: app/code/local/Pb/Pbgsp/Model/Catalog/File.php
|
app/code/local/Pb/Pbgsp/Model/Catalog/Product.php
CHANGED
@@ -1,8 +1,8 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
* Product: Pb_Pbgsp (1.1.
|
4 |
-
* Packaged: 2015-09-
|
5 |
-
* Last Modified: 2015-09-
|
6 |
|
7 |
|
8 |
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.1.2)
|
4 |
+
* Packaged: 2015-09-23T12:09:53+00:00
|
5 |
+
* Last Modified: 2015-09-14T12:11:20+00:00
|
6 |
|
7 |
|
8 |
|
app/code/local/Pb/Pbgsp/Model/Credentials.php
CHANGED
@@ -1,8 +1,8 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
* Product: Pb_Pbgsp (1.1.
|
4 |
-
* Packaged: 2015-09-
|
5 |
-
* Last Modified: 2015-09-
|
6 |
|
7 |
|
8 |
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.1.2)
|
4 |
+
* Packaged: 2015-09-23T12:09:53+00:00
|
5 |
+
* Last Modified: 2015-09-14T12:11:20+00:00
|
6 |
|
7 |
|
8 |
|
app/code/local/Pb/Pbgsp/Model/Creditmemo/Duty.php
CHANGED
@@ -1,8 +1,8 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
* Product: Pb_Pbgsp (1.1.
|
4 |
-
* Packaged: 2015-09-
|
5 |
-
* Last Modified: 2015-09-
|
6 |
|
7 |
|
8 |
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.1.2)
|
4 |
+
* Packaged: 2015-09-23T12:09:53+00:00
|
5 |
+
* Last Modified: 2015-09-14T12:11:20+00:00
|
6 |
|
7 |
|
8 |
|
app/code/local/Pb/Pbgsp/Model/Handlingoptions.php
CHANGED
@@ -1,8 +1,8 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
* Product: Pb_Pbgsp (1.1.
|
4 |
-
* Packaged: 2015-09-
|
5 |
-
* Last Modified: 2015-09-
|
6 |
|
7 |
|
8 |
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.1.2)
|
4 |
+
* Packaged: 2015-09-23T12:09:53+00:00
|
5 |
+
* Last Modified: 2015-09-14T12:11:20+00:00
|
6 |
|
7 |
|
8 |
|
app/code/local/Pb/Pbgsp/Model/Helper.php
CHANGED
@@ -1,8 +1,8 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
* Product: Pb_Pbgsp (1.1.
|
4 |
-
* Packaged: 2015-09-
|
5 |
-
* Last Modified: 2015-09-
|
6 |
|
7 |
|
8 |
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.1.2)
|
4 |
+
* Packaged: 2015-09-23T12:09:53+00:00
|
5 |
+
* Last Modified: 2015-09-14T12:11:20+00:00
|
6 |
|
7 |
|
8 |
|
app/code/local/Pb/Pbgsp/Model/Inboundparcel.php
CHANGED
@@ -1,8 +1,8 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
* Product: Pb_Pbgsp (1.1.
|
4 |
-
* Packaged: 2015-09-
|
5 |
-
* Last Modified: 2015-09-
|
6 |
|
7 |
|
8 |
|
@@ -16,6 +16,104 @@ class Pb_Pbgsp_Model_Inboundparcel extends Mage_Core_Model_Abstract {
|
|
16 |
parent::_construct();
|
17 |
$this->_init('pb_pbgsp/inboundparcel');
|
18 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
19 |
}
|
20 |
|
21 |
?>
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.1.2)
|
4 |
+
* Packaged: 2015-09-23T12:09:53+00:00
|
5 |
+
* Last Modified: 2015-09-14T12:11:20+00:00
|
6 |
|
7 |
|
8 |
|
16 |
parent::_construct();
|
17 |
$this->_init('pb_pbgsp/inboundparcel');
|
18 |
}
|
19 |
+
|
20 |
+
/* Method call hourly and try to generate ASN for fullfilled orders.
|
21 |
+
Created by: Sudarshan
|
22 |
+
Date: 07/09/2015
|
23 |
+
|
24 |
+
*/
|
25 |
+
public function generateInboundParcelPreAdviceCron(){
|
26 |
+
|
27 |
+
if(Pb_Pbgsp_Model_Credentials::isASNGenerationEnabled() == '1') {
|
28 |
+
try {
|
29 |
+
|
30 |
+
// Get PB orders
|
31 |
+
$clearPathOrders = Mage::getModel("pb_pbgsp/ordernumber")-> getCollection();
|
32 |
+
|
33 |
+
// Get Inbound parcels
|
34 |
+
// $parcels = Mage::getModel("pb_pbgsp/inboundparcel")-> getCollection();
|
35 |
+
// $parcels->addFieldToSelect('mage_order_number');
|
36 |
+
|
37 |
+
|
38 |
+
echo "</br>Trying to generate ASN PBorders which are fullfilled but doesn't have ASN </br> ";
|
39 |
+
// find order that doesn't have ASN entry.
|
40 |
+
|
41 |
+
foreach($clearPathOrders as $clearPathOrder)
|
42 |
+
{
|
43 |
+
$orderID = $clearPathOrder['mage_order_number'];
|
44 |
+
|
45 |
+
$cpOrderNumber = $clearPathOrder['cp_order_number'];
|
46 |
+
$order = Mage::getModel('sales/order')->loadByIncrementId($orderID);
|
47 |
+
|
48 |
+
if(($order->hasShipments()) && ($order['status'] != 'canceled')){
|
49 |
+
|
50 |
+
$shipmentCollection = Mage::getResourceModel('sales/order_shipment_collection')->setOrderFilter($order)->load();
|
51 |
+
|
52 |
+
foreach ($shipmentCollection as $shipment){
|
53 |
+
|
54 |
+
//Get shipment id
|
55 |
+
$shipId = $shipment['entity_id'];
|
56 |
+
|
57 |
+
//check shipment entry of order in table (partially shipped order)
|
58 |
+
$parcels = Mage::getModel("pb_pbgsp/inboundparcel")-> getCollection();
|
59 |
+
$parcels->addFieldToFilter('mage_order_number',$orderID);
|
60 |
+
$parcels->addFieldToFilter('mage_order_shipment_number',$shipId);
|
61 |
+
|
62 |
+
if(count($parcels) == 0){
|
63 |
+
echo "</br>$orderID Ship- $shipId ";
|
64 |
+
Pb_Pbgsp_Model_Util::log('Generate ASN for Order-'.$orderID.' Ship- '.$shipId );
|
65 |
+
$items = array();
|
66 |
+
|
67 |
+
$parcelResponse = Pb_Pbgsp_Model_Api::generateInboundParcelNumber($shipment,$items,$order,$cpOrderNumber);
|
68 |
+
|
69 |
+
if(array_key_exists('errors',$parcelResponse)) {
|
70 |
+
echo " - Error \"".$parcelResponse['errors'][0]['message']."\"";
|
71 |
+
Pb_Pbgsp_Model_Util::log("Error generating inbound parcel");
|
72 |
+
Pb_Pbgsp_Model_Util::log($parcelResponse);
|
73 |
+
}
|
74 |
+
else if(isset($parcelResponse['parcelIdentifier']))
|
75 |
+
{
|
76 |
+
//Save entry in table
|
77 |
+
$cpParcel = Mage::getModel('pb_pbgsp/inboundparcel');
|
78 |
+
$cpParcel->setInboundParcel($parcelResponse['parcelIdentifier']);
|
79 |
+
$cpParcel->setMageOrderNumber( $order->getRealOrderId());
|
80 |
+
$cpParcel->setPbOrderNumber( $cpOrderNumber);
|
81 |
+
$cpParcel->setMageOrderShipmentNumber( $shipId);
|
82 |
+
$cpParcel->save();
|
83 |
+
|
84 |
+
// add the tracking info magento
|
85 |
+
$track = Mage::getModel('sales/order_shipment_track')
|
86 |
+
->setShipment($shipment)
|
87 |
+
->setData('title', 'PB')
|
88 |
+
->setData('number',$parcelResponse['parcelIdentifier'])
|
89 |
+
->setData('carrier_code', 'custom')
|
90 |
+
->setData('order_id', $shipment->getData('order_id'))
|
91 |
+
->save();
|
92 |
+
|
93 |
+
Pb_Pbgsp_Model_Util::log($parcelResponse['parcelIdentifier']."Inbound Parcel Number Saved");
|
94 |
+
}
|
95 |
+
|
96 |
+
}
|
97 |
+
|
98 |
+
}
|
99 |
+
|
100 |
+
|
101 |
+
}else{
|
102 |
+
//echo " - Not fullfilled yet";
|
103 |
+
}
|
104 |
+
|
105 |
+
unset($order);
|
106 |
+
unset($shipmentCollection);
|
107 |
+
}
|
108 |
+
|
109 |
+
|
110 |
+
}
|
111 |
+
catch(Exception $e) {
|
112 |
+
Pb_Pbgsp_Model_Util::log("Error creating inbound parcel. ");
|
113 |
+
Pb_Pbgsp_Model_Util::logException($e);
|
114 |
+
}
|
115 |
+
}
|
116 |
+
}
|
117 |
}
|
118 |
|
119 |
?>
|
app/code/local/Pb/Pbgsp/Model/Invoice/Duty.php
CHANGED
@@ -1,8 +1,8 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
* Product: Pb_Pbgsp (1.1.
|
4 |
-
* Packaged: 2015-09-
|
5 |
-
* Last Modified: 2015-09-
|
6 |
|
7 |
|
8 |
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.1.2)
|
4 |
+
* Packaged: 2015-09-23T12:09:53+00:00
|
5 |
+
* Last Modified: 2015-09-14T12:11:20+00:00
|
6 |
|
7 |
|
8 |
|
app/code/local/Pb/Pbgsp/Model/Messages.php
CHANGED
@@ -1,8 +1,8 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
* Product: Pb_Pbgsp (1.1.
|
4 |
-
* Packaged: 2015-09-
|
5 |
-
* Last Modified: 2015-09-
|
6 |
|
7 |
|
8 |
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.1.2)
|
4 |
+
* Packaged: 2015-09-23T12:09:53+00:00
|
5 |
+
* Last Modified: 2015-09-14T12:11:20+00:00
|
6 |
|
7 |
|
8 |
|
app/code/local/Pb/Pbgsp/Model/Mysql4/Inboundparcel.php
CHANGED
@@ -1,8 +1,8 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
* Product: Pb_Pbgsp (1.1.
|
4 |
-
* Packaged: 2015-09-
|
5 |
-
* Last Modified: 2015-09-
|
6 |
|
7 |
|
8 |
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.1.2)
|
4 |
+
* Packaged: 2015-09-23T12:09:53+00:00
|
5 |
+
* Last Modified: 2015-09-14T12:11:20+00:00
|
6 |
|
7 |
|
8 |
|
app/code/local/Pb/Pbgsp/Model/Mysql4/Inboundparcel/Collection.php
CHANGED
@@ -1,8 +1,8 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
* Product: Pb_Pbgsp (1.1.
|
4 |
-
* Packaged: 2015-09-
|
5 |
-
* Last Modified: 2015-09-
|
6 |
|
7 |
|
8 |
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.1.2)
|
4 |
+
* Packaged: 2015-09-23T12:09:53+00:00
|
5 |
+
* Last Modified: 2015-09-14T12:11:20+00:00
|
6 |
|
7 |
|
8 |
|
app/code/local/Pb/Pbgsp/Model/Mysql4/Ordernumber.php
CHANGED
@@ -1,8 +1,8 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
* Product: Pb_Pbgsp (1.1.
|
4 |
-
* Packaged: 2015-09-
|
5 |
-
* Last Modified: 2015-09-
|
6 |
|
7 |
|
8 |
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.1.2)
|
4 |
+
* Packaged: 2015-09-23T12:09:53+00:00
|
5 |
+
* Last Modified: 2015-09-14T12:11:20+00:00
|
6 |
|
7 |
|
8 |
|
app/code/local/Pb/Pbgsp/Model/Mysql4/Ordernumber/Collection.php
CHANGED
@@ -1,8 +1,8 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
* Product: Pb_Pbgsp (1.1.
|
4 |
-
* Packaged: 2015-09-
|
5 |
-
* Last Modified: 2015-09-
|
6 |
|
7 |
|
8 |
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.1.2)
|
4 |
+
* Packaged: 2015-09-23T12:09:53+00:00
|
5 |
+
* Last Modified: 2015-09-14T12:11:20+00:00
|
6 |
|
7 |
|
8 |
|
app/code/local/Pb/Pbgsp/Model/Mysql4/Variable.php
CHANGED
@@ -1,8 +1,8 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
* Product: Pb_Pbgsp (1.1.
|
4 |
-
* Packaged: 2015-09-
|
5 |
-
* Last Modified: 2015-09-
|
6 |
|
7 |
|
8 |
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.1.2)
|
4 |
+
* Packaged: 2015-09-23T12:09:53+00:00
|
5 |
+
* Last Modified: 2015-09-14T12:11:20+00:00
|
6 |
|
7 |
|
8 |
|
app/code/local/Pb/Pbgsp/Model/Mysql4/Variable/Collection.php
CHANGED
@@ -1,8 +1,8 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
* Product: Pb_Pbgsp (1.1.
|
4 |
-
* Packaged: 2015-09-
|
5 |
-
* Last Modified: 2015-09-
|
6 |
|
7 |
|
8 |
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.1.2)
|
4 |
+
* Packaged: 2015-09-23T12:09:53+00:00
|
5 |
+
* Last Modified: 2015-09-14T12:11:20+00:00
|
6 |
|
7 |
|
8 |
|
app/code/local/Pb/Pbgsp/Model/Observer.php
CHANGED
@@ -1,8 +1,8 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
* Product: Pb_Pbgsp (1.
|
4 |
-
* Packaged: 2015-09-
|
5 |
-
* Last Modified: 2015-
|
6 |
|
7 |
|
8 |
|
@@ -48,6 +48,8 @@ class Pb_Pbgsp_Model_Observer {
|
|
48 |
try {
|
49 |
$shipment = $observer->getEvent()->getShipment();
|
50 |
$order = $shipment->getOrder();
|
|
|
|
|
51 |
/* @var $order Mage_Sales_Model_Order */
|
52 |
|
53 |
if(!$this->isPbOrder($order))
|
@@ -80,12 +82,24 @@ class Pb_Pbgsp_Model_Observer {
|
|
80 |
Pb_Pbgsp_Model_Util::log($parcelResponse);
|
81 |
}
|
82 |
else {
|
|
|
|
|
83 |
$cpParcel = Mage::getModel('pb_pbgsp/inboundparcel');
|
84 |
$cpParcel->setInboundParcel($parcelResponse['parcelIdentifier']);
|
85 |
$cpParcel->setMageOrderNumber( $order->getRealOrderId());
|
86 |
$cpParcel->setPbOrderNumber( $cpOrderNumber);
|
|
|
87 |
$cpParcel->save();
|
88 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
89 |
Pb_Pbgsp_Model_Util::log('Inbound Parcel Number Saved');
|
90 |
}
|
91 |
|
@@ -285,8 +299,12 @@ class Pb_Pbgsp_Model_Observer {
|
|
285 |
$cpord = $this->_getCPORD($observer->getEvent()->getBlock()->getOrder());
|
286 |
if($cpord) {
|
287 |
$staging = 0;
|
288 |
-
if(strpos(Pb_Pbgsp_Model_Credentials::getCheckoutUrl(),'cpsandbox')
|
289 |
$staging = 1;
|
|
|
|
|
|
|
|
|
290 |
$transport['html'] = "<a href='http://tracking.ecommerce.pb.com/track/$cpord?staging=$staging'>Track your order</a>";
|
291 |
}
|
292 |
|
@@ -316,8 +334,10 @@ class Pb_Pbgsp_Model_Observer {
|
|
316 |
$cpord = $this->_getCPORD(Mage::getModel('sales/order')->load($orderId));
|
317 |
if($cpord) {
|
318 |
$staging = 0;
|
319 |
-
if(strpos(Pb_Pbgsp_Model_Credentials::getCheckoutUrl(),'cpsandbox')
|
320 |
$staging = 1;
|
|
|
|
|
321 |
$script = "<script lang='javascript'>
|
322 |
window.location = 'http://tracking.ecommerce.pb.com/track/$cpord?staging=$staging';
|
323 |
</script>
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.1.2)
|
4 |
+
* Packaged: 2015-09-23T12:09:53+00:00
|
5 |
+
* Last Modified: 2015-09-14T12:11:20+00:00
|
6 |
|
7 |
|
8 |
|
48 |
try {
|
49 |
$shipment = $observer->getEvent()->getShipment();
|
50 |
$order = $shipment->getOrder();
|
51 |
+
$shipId = $shipment['entity_id'];
|
52 |
+
|
53 |
/* @var $order Mage_Sales_Model_Order */
|
54 |
|
55 |
if(!$this->isPbOrder($order))
|
82 |
Pb_Pbgsp_Model_Util::log($parcelResponse);
|
83 |
}
|
84 |
else {
|
85 |
+
|
86 |
+
//Save entry in table
|
87 |
$cpParcel = Mage::getModel('pb_pbgsp/inboundparcel');
|
88 |
$cpParcel->setInboundParcel($parcelResponse['parcelIdentifier']);
|
89 |
$cpParcel->setMageOrderNumber( $order->getRealOrderId());
|
90 |
$cpParcel->setPbOrderNumber( $cpOrderNumber);
|
91 |
+
$cpParcel->setMageOrderShipmentNumber( $shipId);
|
92 |
$cpParcel->save();
|
93 |
|
94 |
+
// add the tracking info magento
|
95 |
+
$track = Mage::getModel('sales/order_shipment_track')
|
96 |
+
->setShipment($shipment)
|
97 |
+
->setData('title', 'PB')
|
98 |
+
->setData('number',$parcelResponse['parcelIdentifier'])
|
99 |
+
->setData('carrier_code', 'custom')
|
100 |
+
->setData('order_id', $shipment->getData('order_id'))
|
101 |
+
->save();
|
102 |
+
|
103 |
Pb_Pbgsp_Model_Util::log('Inbound Parcel Number Saved');
|
104 |
}
|
105 |
|
299 |
$cpord = $this->_getCPORD($observer->getEvent()->getBlock()->getOrder());
|
300 |
if($cpord) {
|
301 |
$staging = 0;
|
302 |
+
if(strpos(Pb_Pbgsp_Model_Credentials::getCheckoutUrl(),'cpsandbox'))
|
303 |
$staging = 1;
|
304 |
+
|
305 |
+
|
306 |
+
|
307 |
+
|
308 |
$transport['html'] = "<a href='http://tracking.ecommerce.pb.com/track/$cpord?staging=$staging'>Track your order</a>";
|
309 |
}
|
310 |
|
334 |
$cpord = $this->_getCPORD(Mage::getModel('sales/order')->load($orderId));
|
335 |
if($cpord) {
|
336 |
$staging = 0;
|
337 |
+
if(strpos(Pb_Pbgsp_Model_Credentials::getCheckoutUrl(),'cpsandbox'))
|
338 |
$staging = 1;
|
339 |
+
|
340 |
+
|
341 |
$script = "<script lang='javascript'>
|
342 |
window.location = 'http://tracking.ecommerce.pb.com/track/$cpord?staging=$staging';
|
343 |
</script>
|
app/code/local/Pb/Pbgsp/Model/Ordernumber.php
CHANGED
@@ -1,8 +1,8 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
* Product: Pb_Pbgsp (1.1.
|
4 |
-
* Packaged: 2015-09-
|
5 |
-
* Last Modified: 2015-09-
|
6 |
|
7 |
|
8 |
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.1.2)
|
4 |
+
* Packaged: 2015-09-23T12:09:53+00:00
|
5 |
+
* Last Modified: 2015-09-14T12:11:20+00:00
|
6 |
|
7 |
|
8 |
|
app/code/local/Pb/Pbgsp/Model/Pdf/Tax.php
CHANGED
@@ -1,8 +1,8 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
* Product: Pb_Pbgsp (1.1.
|
4 |
-
* Packaged: 2015-09-
|
5 |
-
* Last Modified: 2015-09-
|
6 |
|
7 |
|
8 |
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.1.2)
|
4 |
+
* Packaged: 2015-09-23T12:09:53+00:00
|
5 |
+
* Last Modified: 2015-09-14T12:11:20+00:00
|
6 |
|
7 |
|
8 |
|
app/code/local/Pb/Pbgsp/Model/Quote/Duty.php
CHANGED
@@ -1,9 +1,9 @@
|
|
1 |
<?php
|
2 |
|
3 |
/**
|
4 |
-
* Product: Pb_Pbgsp (1.1.
|
5 |
-
* Packaged: 2015-09-
|
6 |
-
* Last Modified: 2015-09-
|
7 |
|
8 |
|
9 |
|
1 |
<?php
|
2 |
|
3 |
/**
|
4 |
+
* Product: Pb_Pbgsp (1.1.2)
|
5 |
+
* Packaged: 2015-09-23T12:09:53+00:00
|
6 |
+
* Last Modified: 2015-09-14T12:11:20+00:00
|
7 |
|
8 |
|
9 |
|
app/code/local/Pb/Pbgsp/Model/Resource/Mysql4/Setup.php
CHANGED
@@ -1,8 +1,8 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
* Product: Pb_Pbgsp (1.1.
|
4 |
-
* Packaged: 2015-09-
|
5 |
-
* Last Modified: 2015-09-
|
6 |
|
7 |
|
8 |
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.1.2)
|
4 |
+
* Packaged: 2015-09-23T12:09:53+00:00
|
5 |
+
* Last Modified: 2015-09-14T12:11:20+00:00
|
6 |
|
7 |
|
8 |
|
app/code/local/Pb/Pbgsp/Model/Sales/Order/Shipment.php
CHANGED
@@ -1,8 +1,8 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
* Product: Pb_Pbgsp (1.1.
|
4 |
-
* Packaged: 2015-09-
|
5 |
-
* Last Modified: 2015-09-
|
6 |
|
7 |
|
8 |
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.1.2)
|
4 |
+
* Packaged: 2015-09-23T12:09:53+00:00
|
5 |
+
* Last Modified: 2015-09-14T12:11:20+00:00
|
6 |
|
7 |
|
8 |
|
app/code/local/Pb/Pbgsp/Model/Util.php
CHANGED
@@ -1,8 +1,8 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
* Product: Pb_Pbgsp (1.1.
|
4 |
-
* Packaged: 2015-09-
|
5 |
-
* Last Modified: 2015-09-
|
6 |
|
7 |
|
8 |
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.1.2)
|
4 |
+
* Packaged: 2015-09-23T12:09:53+00:00
|
5 |
+
* Last Modified: 2015-09-14T12:11:20+00:00
|
6 |
|
7 |
|
8 |
|
app/code/local/Pb/Pbgsp/Model/Variable.php
CHANGED
@@ -1,8 +1,8 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
* Product: Pb_Pbgsp (1.1.
|
4 |
-
* Packaged: 2015-09-
|
5 |
-
* Last Modified: 2015-09-
|
6 |
|
7 |
|
8 |
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.1.2)
|
4 |
+
* Packaged: 2015-09-23T12:09:53+00:00
|
5 |
+
* Last Modified: 2015-09-14T12:11:20+00:00
|
6 |
|
7 |
|
8 |
|
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.1.
|
4 |
-
* Packaged: 2015-09-
|
5 |
-
* Last Modified: 2015-09-
|
6 |
|
7 |
|
8 |
* File: app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.1.2)
|
4 |
+
* Packaged: 2015-09-23T12:09:53+00:00
|
5 |
+
* Last Modified: 2015-09-14T12:11:20+00:00
|
6 |
|
7 |
|
8 |
* File: app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php
|
app/code/local/Pb/Pbgsp/etc/config.xml
CHANGED
@@ -2,7 +2,7 @@
|
|
2 |
<config>
|
3 |
<modules>
|
4 |
<Pb_Pbgsp>
|
5 |
-
<version>1.1.
|
6 |
</Pb_Pbgsp>
|
7 |
</modules>
|
8 |
<global>
|
@@ -473,6 +473,15 @@
|
|
473 |
<model>pb_pbgsp/catalog_cron::processStatusNotifications</model>
|
474 |
</run>
|
475 |
</pb_notifications>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
476 |
</jobs>
|
477 |
</crontab>
|
478 |
<adminhtml>
|
2 |
<config>
|
3 |
<modules>
|
4 |
<Pb_Pbgsp>
|
5 |
+
<version>1.1.2</version>
|
6 |
</Pb_Pbgsp>
|
7 |
</modules>
|
8 |
<global>
|
473 |
<model>pb_pbgsp/catalog_cron::processStatusNotifications</model>
|
474 |
</run>
|
475 |
</pb_notifications>
|
476 |
+
|
477 |
+
<pb_generateASN>
|
478 |
+
<schedule>
|
479 |
+
<cron_expr>0 * * * *</cron_expr>
|
480 |
+
</schedule>
|
481 |
+
<run>
|
482 |
+
<model>pb_pbgsp/Inboundparcel::generateInboundParcelPreAdviceCron</model>
|
483 |
+
</run>
|
484 |
+
</pb_generateASN>
|
485 |
</jobs>
|
486 |
</crontab>
|
487 |
<adminhtml>
|
app/code/local/Pb/Pbgsp/etc/system.xml
CHANGED
@@ -1,442 +1,446 @@
|
|
1 |
-
<?xml version="1.0"?>
|
2 |
-
<config>
|
3 |
-
<sections>
|
4 |
-
<carriers>
|
5 |
-
<groups>
|
6 |
-
<pbgsp translate="label" module="shipping">
|
7 |
-
<label>Pitney Bowes PBGSP</label>
|
8 |
-
<frontend_type>text</frontend_type>
|
9 |
-
<sort_order>13</sort_order>
|
10 |
-
<show_in_default>1</show_in_default>
|
11 |
-
<show_in_website>1</show_in_website>
|
12 |
-
<show_in_store>1</show_in_store>
|
13 |
-
<fields>
|
14 |
-
<active translate="label">
|
15 |
-
<label>Enabled</label>
|
16 |
-
<frontend_type>select</frontend_type>
|
17 |
-
<source_model>adminhtml/system_config_source_yesno</source_model>
|
18 |
-
<sort_order>1</sort_order>
|
19 |
-
<show_in_default>1</show_in_default>
|
20 |
-
<show_in_website>1</show_in_website>
|
21 |
-
<show_in_store>1</show_in_store>
|
22 |
-
</active>
|
23 |
-
<merchantcode translate="label">
|
24 |
-
<label>Merchant Code</label>
|
25 |
-
<frontend_type>text</frontend_type>
|
26 |
-
<backend_model>adminhtml/system_config_backend_encrypted</backend_model>
|
27 |
-
<sort_order>10</sort_order>
|
28 |
-
<show_in_default>1</show_in_default>
|
29 |
-
<show_in_website>1</show_in_website>
|
30 |
-
<show_in_store>1</show_in_store>
|
31 |
-
</merchantcode>
|
32 |
-
<authorization_endpoint translate="label">
|
33 |
-
<label>Authorization Endpoint</label>
|
34 |
-
|
35 |
-
|
36 |
-
|
37 |
-
<
|
38 |
-
<
|
39 |
-
|
40 |
-
|
41 |
-
|
42 |
-
|
43 |
-
<
|
44 |
-
<
|
45 |
-
<
|
46 |
-
<
|
47 |
-
|
48 |
-
|
49 |
-
|
50 |
-
|
51 |
-
|
52 |
-
<
|
53 |
-
|
54 |
-
<
|
55 |
-
<
|
56 |
-
|
57 |
-
|
58 |
-
|
59 |
-
|
60 |
-
<
|
61 |
-
<
|
62 |
-
<
|
63 |
-
<
|
64 |
-
<
|
65 |
-
|
66 |
-
|
67 |
-
|
68 |
-
|
69 |
-
<
|
70 |
-
<
|
71 |
-
<
|
72 |
-
<
|
73 |
-
<
|
74 |
-
|
75 |
-
|
76 |
-
|
77 |
-
|
78 |
-
<
|
79 |
-
<
|
80 |
-
<
|
81 |
-
<
|
82 |
-
<
|
83 |
-
|
84 |
-
|
85 |
-
|
86 |
-
|
87 |
-
<
|
88 |
-
<
|
89 |
-
<
|
90 |
-
<
|
91 |
-
<
|
92 |
-
|
93 |
-
|
94 |
-
|
95 |
-
|
96 |
-
<
|
97 |
-
<
|
98 |
-
<
|
99 |
-
<
|
100 |
-
|
101 |
-
|
102 |
-
|
103 |
-
|
104 |
-
<
|
105 |
-
<
|
106 |
-
<
|
107 |
-
<
|
108 |
-
|
109 |
-
|
110 |
-
|
111 |
-
|
112 |
-
<
|
113 |
-
<
|
114 |
-
<
|
115 |
-
<
|
116 |
-
<
|
117 |
-
|
118 |
-
|
119 |
-
|
120 |
-
|
121 |
-
<
|
122 |
-
<
|
123 |
-
<
|
124 |
-
<
|
125 |
-
|
126 |
-
|
127 |
-
|
128 |
-
|
129 |
-
|
130 |
-
<
|
131 |
-
|
132 |
-
<
|
133 |
-
|
134 |
-
|
135 |
-
|
136 |
-
|
137 |
-
<
|
138 |
-
<
|
139 |
-
<
|
140 |
-
<
|
141 |
-
<
|
142 |
-
|
143 |
-
|
144 |
-
|
145 |
-
|
146 |
-
|
147 |
-
<
|
148 |
-
|
149 |
-
<
|
150 |
-
<
|
151 |
-
|
152 |
-
|
153 |
-
|
154 |
-
|
155 |
-
<
|
156 |
-
<
|
157 |
-
<
|
158 |
-
<
|
159 |
-
<
|
160 |
-
|
161 |
-
|
162 |
-
|
163 |
-
|
164 |
-
<
|
165 |
-
<
|
166 |
-
<
|
167 |
-
<
|
168 |
-
<
|
169 |
-
|
170 |
-
|
171 |
-
|
172 |
-
|
173 |
-
|
174 |
-
<
|
175 |
-
|
176 |
-
<
|
177 |
-
|
178 |
-
|
179 |
-
|
180 |
-
|
181 |
-
<
|
182 |
-
<
|
183 |
-
<
|
184 |
-
<
|
185 |
-
<
|
186 |
-
|
187 |
-
|
188 |
-
|
189 |
-
|
190 |
-
<
|
191 |
-
<
|
192 |
-
<
|
193 |
-
<
|
194 |
-
<
|
195 |
-
|
196 |
-
|
197 |
-
|
198 |
-
|
199 |
-
<
|
200 |
-
<
|
201 |
-
<
|
202 |
-
<
|
203 |
-
<
|
204 |
-
|
205 |
-
|
206 |
-
|
207 |
-
|
208 |
-
|
209 |
-
|
210 |
-
|
211 |
-
|
212 |
-
|
213 |
-
<
|
214 |
-
<
|
215 |
-
<
|
216 |
-
<
|
217 |
-
<
|
218 |
-
|
219 |
-
|
220 |
-
|
221 |
-
|
222 |
-
<
|
223 |
-
<
|
224 |
-
<
|
225 |
-
<
|
226 |
-
|
227 |
-
|
228 |
-
|
229 |
-
|
230 |
-
<
|
231 |
-
<
|
232 |
-
<
|
233 |
-
<
|
234 |
-
<
|
235 |
-
|
236 |
-
|
237 |
-
|
238 |
-
|
239 |
-
|
240 |
-
<
|
241 |
-
<
|
242 |
-
<
|
243 |
-
<
|
244 |
-
|
245 |
-
|
246 |
-
|
247 |
-
|
248 |
-
<
|
249 |
-
|
250 |
-
<
|
251 |
-
|
252 |
-
|
253 |
-
|
254 |
-
|
255 |
-
|
256 |
-
|
257 |
-
|
258 |
-
|
259 |
-
<
|
260 |
-
<
|
261 |
-
|
262 |
-
|
263 |
-
<
|
264 |
-
<
|
265 |
-
|
266 |
-
|
267 |
-
<
|
268 |
-
<
|
269 |
-
<
|
270 |
-
|
271 |
-
|
272 |
-
<
|
273 |
-
<
|
274 |
-
|
275 |
-
|
276 |
-
<
|
277 |
-
<
|
278 |
-
|
279 |
-
|
280 |
-
<
|
281 |
-
<
|
282 |
-
|
283 |
-
|
284 |
-
<
|
285 |
-
<
|
286 |
-
<
|
287 |
-
|
288 |
-
|
289 |
-
<
|
290 |
-
<
|
291 |
-
|
292 |
-
|
293 |
-
<
|
294 |
-
<
|
295 |
-
<
|
296 |
-
|
297 |
-
|
298 |
-
<
|
299 |
-
<
|
300 |
-
|
301 |
-
|
302 |
-
<
|
303 |
-
<
|
304 |
-
<
|
305 |
-
|
306 |
-
|
307 |
-
|
308 |
-
|
309 |
-
|
310 |
-
|
311 |
-
|
312 |
-
<
|
313 |
-
<
|
314 |
-
<
|
315 |
-
<
|
316 |
-
|
317 |
-
|
318 |
-
<
|
319 |
-
<
|
320 |
-
|
321 |
-
|
322 |
-
<
|
323 |
-
<
|
324 |
-
<
|
325 |
-
|
326 |
-
|
327 |
-
<
|
328 |
-
<
|
329 |
-
|
330 |
-
|
331 |
-
<
|
332 |
-
<
|
333 |
-
<
|
334 |
-
<
|
335 |
-
|
336 |
-
|
337 |
-
<
|
338 |
-
<
|
339 |
-
|
340 |
-
|
341 |
-
<
|
342 |
-
<
|
343 |
-
|
344 |
-
|
345 |
-
|
346 |
-
|
347 |
-
|
348 |
-
|
349 |
-
|
350 |
-
<
|
351 |
-
<
|
352 |
-
<
|
353 |
-
|
354 |
-
|
355 |
-
<
|
356 |
-
<
|
357 |
-
|
358 |
-
|
359 |
-
<
|
360 |
-
<
|
361 |
-
<
|
362 |
-
<
|
363 |
-
|
364 |
-
|
365 |
-
<
|
366 |
-
<
|
367 |
-
|
368 |
-
|
369 |
-
<
|
370 |
-
<
|
371 |
-
|
372 |
-
|
373 |
-
|
374 |
-
<
|
375 |
-
<
|
376 |
-
|
377 |
-
|
378 |
-
<
|
379 |
-
<
|
380 |
-
|
381 |
-
|
382 |
-
<
|
383 |
-
<
|
384 |
-
|
385 |
-
|
386 |
-
<
|
387 |
-
<
|
388 |
-
<
|
389 |
-
<
|
390 |
-
|
391 |
-
|
392 |
-
<
|
393 |
-
<
|
394 |
-
|
395 |
-
|
396 |
-
<
|
397 |
-
<
|
398 |
-
|
399 |
-
|
400 |
-
|
401 |
-
<
|
402 |
-
<
|
403 |
-
|
404 |
-
|
405 |
-
<
|
406 |
-
<
|
407 |
-
|
408 |
-
|
409 |
-
|
410 |
-
<
|
411 |
-
<
|
412 |
-
|
413 |
-
|
414 |
-
<
|
415 |
-
<
|
416 |
-
|
417 |
-
|
418 |
-
|
419 |
-
<
|
420 |
-
<
|
421 |
-
|
422 |
-
|
423 |
-
<
|
424 |
-
<
|
425 |
-
<
|
426 |
-
|
427 |
-
|
428 |
-
<
|
429 |
-
<
|
430 |
-
|
431 |
-
|
432 |
-
<
|
433 |
-
<
|
434 |
-
|
435 |
-
|
436 |
-
|
437 |
-
|
438 |
-
|
439 |
-
|
440 |
-
|
441 |
-
|
442 |
-
</
|
|
|
|
|
|
|
|
1 |
+
<?xml version="1.0"?>
|
2 |
+
<config>
|
3 |
+
<sections>
|
4 |
+
<carriers>
|
5 |
+
<groups>
|
6 |
+
<pbgsp translate="label" module="shipping">
|
7 |
+
<label>Pitney Bowes PBGSP</label>
|
8 |
+
<frontend_type>text</frontend_type>
|
9 |
+
<sort_order>13</sort_order>
|
10 |
+
<show_in_default>1</show_in_default>
|
11 |
+
<show_in_website>1</show_in_website>
|
12 |
+
<show_in_store>1</show_in_store>
|
13 |
+
<fields>
|
14 |
+
<active translate="label">
|
15 |
+
<label>Enabled</label>
|
16 |
+
<frontend_type>select</frontend_type>
|
17 |
+
<source_model>adminhtml/system_config_source_yesno</source_model>
|
18 |
+
<sort_order>1</sort_order>
|
19 |
+
<show_in_default>1</show_in_default>
|
20 |
+
<show_in_website>1</show_in_website>
|
21 |
+
<show_in_store>1</show_in_store>
|
22 |
+
</active>
|
23 |
+
<merchantcode translate="label">
|
24 |
+
<label>Merchant Code</label>
|
25 |
+
<frontend_type>text</frontend_type>
|
26 |
+
<backend_model>adminhtml/system_config_backend_encrypted</backend_model>
|
27 |
+
<sort_order>10</sort_order>
|
28 |
+
<show_in_default>1</show_in_default>
|
29 |
+
<show_in_website>1</show_in_website>
|
30 |
+
<show_in_store>1</show_in_store>
|
31 |
+
</merchantcode>
|
32 |
+
<authorization_endpoint translate="label">
|
33 |
+
<label>Authorization Endpoint</label>
|
34 |
+
<!-- <frontend_type>select</frontend_type>
|
35 |
+
<source_model>pb_pbgsp/authapioptions</source_model>-->
|
36 |
+
<frontend_type>text</frontend_type>
|
37 |
+
<sort_order>15</sort_order>
|
38 |
+
<show_in_default>1</show_in_default>
|
39 |
+
<show_in_website>1</show_in_website>
|
40 |
+
<show_in_store>1</show_in_store>
|
41 |
+
</authorization_endpoint>
|
42 |
+
<checkout_endpoint translate="label">
|
43 |
+
<label>Checkout Endpoint</label>
|
44 |
+
<frontend_type>text</frontend_type>
|
45 |
+
<sort_order>16</sort_order>
|
46 |
+
<show_in_default>1</show_in_default>
|
47 |
+
<show_in_website>1</show_in_website>
|
48 |
+
<show_in_store>1</show_in_store>
|
49 |
+
</checkout_endpoint>
|
50 |
+
<order_mgmt_api translate="label">
|
51 |
+
<label>ASN Endpoint</label>
|
52 |
+
<frontend_type>text</frontend_type>
|
53 |
+
|
54 |
+
<sort_order>17</sort_order>
|
55 |
+
<show_in_default>1</show_in_default>
|
56 |
+
<show_in_website>1</show_in_website>
|
57 |
+
<show_in_store>1</show_in_store>
|
58 |
+
</order_mgmt_api>
|
59 |
+
<apiuser translate="label">
|
60 |
+
<label>API username</label>
|
61 |
+
<frontend_type>text</frontend_type>
|
62 |
+
<backend_model>adminhtml/system_config_backend_encrypted</backend_model>
|
63 |
+
<sort_order>20</sort_order>
|
64 |
+
<show_in_default>1</show_in_default>
|
65 |
+
<show_in_website>1</show_in_website>
|
66 |
+
<show_in_store>1</show_in_store>
|
67 |
+
</apiuser>
|
68 |
+
<apipass translate="label">
|
69 |
+
<label>API password</label>
|
70 |
+
<frontend_type>password</frontend_type>
|
71 |
+
<backend_model>adminhtml/system_config_backend_encrypted</backend_model>
|
72 |
+
<sort_order>30</sort_order>
|
73 |
+
<show_in_default>1</show_in_default>
|
74 |
+
<show_in_website>1</show_in_website>
|
75 |
+
<show_in_store>1</show_in_store>
|
76 |
+
</apipass>
|
77 |
+
<ftpuser translate="label">
|
78 |
+
<label>SFTP username</label>
|
79 |
+
<frontend_type>text</frontend_type>
|
80 |
+
<backend_model>adminhtml/system_config_backend_encrypted</backend_model>
|
81 |
+
<sort_order>40</sort_order>
|
82 |
+
<show_in_default>1</show_in_default>
|
83 |
+
<show_in_website>1</show_in_website>
|
84 |
+
<show_in_store>1</show_in_store>
|
85 |
+
</ftpuser>
|
86 |
+
<ftppass translate="label">
|
87 |
+
<label>SFTP password</label>
|
88 |
+
<frontend_type>password</frontend_type>
|
89 |
+
<backend_model>adminhtml/system_config_backend_encrypted</backend_model>
|
90 |
+
<sort_order>50</sort_order>
|
91 |
+
<show_in_default>1</show_in_default>
|
92 |
+
<show_in_website>1</show_in_website>
|
93 |
+
<show_in_store>1</show_in_store>
|
94 |
+
</ftppass>
|
95 |
+
<ftphost translate="label">
|
96 |
+
<label>SFTP hostname</label>
|
97 |
+
<frontend_type>text</frontend_type>
|
98 |
+
<sort_order>60</sort_order>
|
99 |
+
<show_in_default>1</show_in_default>
|
100 |
+
<show_in_website>1</show_in_website>
|
101 |
+
<show_in_store>1</show_in_store>
|
102 |
+
</ftphost>
|
103 |
+
<ftpport translate="label">
|
104 |
+
<label>SFTP port</label>
|
105 |
+
<frontend_type>text</frontend_type>
|
106 |
+
<sort_order>70</sort_order>
|
107 |
+
<show_in_default>1</show_in_default>
|
108 |
+
<show_in_website>1</show_in_website>
|
109 |
+
<show_in_store>1</show_in_store>
|
110 |
+
</ftpport>
|
111 |
+
<ftpdir translate="label">
|
112 |
+
<label>SFTP catalog directory</label>
|
113 |
+
<frontend_type>text</frontend_type>
|
114 |
+
<backend_model>adminhtml/system_config_backend_encrypted</backend_model>
|
115 |
+
<sort_order>80</sort_order>
|
116 |
+
<show_in_default>1</show_in_default>
|
117 |
+
<show_in_website>1</show_in_website>
|
118 |
+
<show_in_store>1</show_in_store>
|
119 |
+
</ftpdir>
|
120 |
+
<catalog_diff translate="label">
|
121 |
+
<label>Catalog update period (hours, min 1 hour)</label>
|
122 |
+
<frontend_type>text</frontend_type>
|
123 |
+
<sort_order>90</sort_order>
|
124 |
+
<show_in_default>1</show_in_default>
|
125 |
+
<show_in_website>1</show_in_website>
|
126 |
+
<show_in_store>1</show_in_store>
|
127 |
+
</catalog_diff>
|
128 |
+
<catalog_full translate="label">
|
129 |
+
<label>Full catalog upload period (days)</label>
|
130 |
+
<frontend_type>text</frontend_type>
|
131 |
+
<sort_order>100</sort_order>
|
132 |
+
<show_in_default>1</show_in_default>
|
133 |
+
<show_in_website>1</show_in_website>
|
134 |
+
<show_in_store>1</show_in_store>
|
135 |
+
</catalog_full>
|
136 |
+
<catalog_size translate="label">
|
137 |
+
<label>Maximum Records Per File</label>
|
138 |
+
<frontend_type>text</frontend_type>
|
139 |
+
<validate>validate-number</validate>
|
140 |
+
<sort_order>105</sort_order>
|
141 |
+
<show_in_default>1</show_in_default>
|
142 |
+
<show_in_website>1</show_in_website>
|
143 |
+
<show_in_store>1</show_in_store>
|
144 |
+
</catalog_size>
|
145 |
+
<catalog_sender_id translate="label">
|
146 |
+
<label>Catalog Sender ID</label>
|
147 |
+
<frontend_type>text</frontend_type>
|
148 |
+
|
149 |
+
<sort_order>106</sort_order>
|
150 |
+
<show_in_default>1</show_in_default>
|
151 |
+
<show_in_website>1</show_in_website>
|
152 |
+
<show_in_store>1</show_in_store>
|
153 |
+
</catalog_sender_id>
|
154 |
+
<admin_email translate="label">
|
155 |
+
<label>Admin Email</label>
|
156 |
+
<frontend_type>text</frontend_type>
|
157 |
+
<validate>validate-email</validate>
|
158 |
+
<sort_order>110</sort_order>
|
159 |
+
<show_in_default>1</show_in_default>
|
160 |
+
<show_in_website>1</show_in_website>
|
161 |
+
<show_in_store>1</show_in_store>
|
162 |
+
</admin_email>
|
163 |
+
<catalog_encryption_enabled translate="label">
|
164 |
+
<label>Catalog Encryption Enabled</label>
|
165 |
+
<frontend_type>select</frontend_type>
|
166 |
+
<source_model>adminhtml/system_config_source_yesno</source_model>
|
167 |
+
<sort_order>115</sort_order>
|
168 |
+
<show_in_default>1</show_in_default>
|
169 |
+
<show_in_website>1</show_in_website>
|
170 |
+
<show_in_store>1</show_in_store>
|
171 |
+
</catalog_encryption_enabled>
|
172 |
+
<encryption_public_key translate="label">
|
173 |
+
<label>Catalog Encryption Public Key</label>
|
174 |
+
<frontend_type>textarea</frontend_type>
|
175 |
+
<sort_order>120</sort_order>
|
176 |
+
<show_in_default>1</show_in_default>
|
177 |
+
<show_in_website>1</show_in_website>
|
178 |
+
<show_in_store>1</show_in_store>
|
179 |
+
</encryption_public_key>
|
180 |
+
<notify_catalog_ok translate="label">
|
181 |
+
<label>Notify on Successful Catalog Export</label>
|
182 |
+
<frontend_type>select</frontend_type>
|
183 |
+
<source_model>adminhtml/system_config_source_yesno</source_model>
|
184 |
+
<sort_order>121</sort_order>
|
185 |
+
<show_in_default>1</show_in_default>
|
186 |
+
<show_in_website>1</show_in_website>
|
187 |
+
<show_in_store>1</show_in_store>
|
188 |
+
</notify_catalog_ok>
|
189 |
+
<notify_catalog_err translate="label">
|
190 |
+
<label>Notify on Catalog Export Failure</label>
|
191 |
+
<frontend_type>select</frontend_type>
|
192 |
+
<source_model>adminhtml/system_config_source_yesno</source_model>
|
193 |
+
<sort_order>122</sort_order>
|
194 |
+
<show_in_default>1</show_in_default>
|
195 |
+
<show_in_website>1</show_in_website>
|
196 |
+
<show_in_store>1</show_in_store>
|
197 |
+
</notify_catalog_err>
|
198 |
+
<asn_generation_enabled translate="label">
|
199 |
+
<label>Generate ASN</label>
|
200 |
+
<frontend_type>select</frontend_type>
|
201 |
+
<source_model>adminhtml/system_config_source_yesno</source_model>
|
202 |
+
<sort_order>125</sort_order>
|
203 |
+
<show_in_default>1</show_in_default>
|
204 |
+
<show_in_website>1</show_in_website>
|
205 |
+
<show_in_store>1</show_in_store>
|
206 |
+
</asn_generation_enabled>
|
207 |
+
|
208 |
+
<!--
|
209 |
+
If the free_shipping_enable flag enable, the system will check free_shipping_subtotal to give free shipping
|
210 |
+
otherwise will use shopping cart price rule behaviour
|
211 |
+
-->
|
212 |
+
<free_shipping_enable translate="label">
|
213 |
+
<label>Free shipping with minimum order amount</label>
|
214 |
+
<frontend_type>select</frontend_type>
|
215 |
+
<source_model>adminhtml/system_config_source_enabledisable</source_model>
|
216 |
+
<sort_order>160</sort_order>
|
217 |
+
<show_in_default>1</show_in_default>
|
218 |
+
<show_in_website>1</show_in_website>
|
219 |
+
<show_in_store>1</show_in_store>
|
220 |
+
</free_shipping_enable>
|
221 |
+
<free_shipping_subtotal translate="label">
|
222 |
+
<label>Minimum order amount for free shipping</label>
|
223 |
+
<frontend_type>text</frontend_type>
|
224 |
+
<sort_order>170</sort_order>
|
225 |
+
<show_in_default>1</show_in_default>
|
226 |
+
<show_in_website>1</show_in_website>
|
227 |
+
<show_in_store>1</show_in_store>
|
228 |
+
</free_shipping_subtotal>
|
229 |
+
<free_tax_enable translate="label">
|
230 |
+
<label>Enable zero tax for customer</label>
|
231 |
+
<frontend_type>select</frontend_type>
|
232 |
+
<source_model>adminhtml/system_config_source_enabledisable</source_model>
|
233 |
+
<sort_order>175</sort_order>
|
234 |
+
<show_in_default>1</show_in_default>
|
235 |
+
<show_in_website>1</show_in_website>
|
236 |
+
<show_in_store>1</show_in_store>
|
237 |
+
</free_tax_enable>
|
238 |
+
|
239 |
+
<sort_order translate="label">
|
240 |
+
<label>Sort order</label>
|
241 |
+
<frontend_type>text</frontend_type>
|
242 |
+
<sort_order>230</sort_order>
|
243 |
+
<show_in_default>1</show_in_default>
|
244 |
+
<show_in_website>1</show_in_website>
|
245 |
+
<show_in_store>1</show_in_store>
|
246 |
+
</sort_order>
|
247 |
+
<title translate="label">
|
248 |
+
<label>Title</label>
|
249 |
+
<validate>required-entry</validate>
|
250 |
+
<frontend_type>text</frontend_type>
|
251 |
+
<validate>required-entry</validate>
|
252 |
+
<sort_order>240</sort_order>
|
253 |
+
<show_in_default>1</show_in_default>
|
254 |
+
<show_in_website>1</show_in_website>
|
255 |
+
<show_in_store>1</show_in_store>
|
256 |
+
</title>
|
257 |
+
<!-- added by BigPixel 6/5/2012 -->
|
258 |
+
<handlingfee translate="label">
|
259 |
+
<label>Handling Fee</label>
|
260 |
+
<frontend_type>text</frontend_type>
|
261 |
+
<sort_order>241</sort_order>
|
262 |
+
<show_in_default>1</show_in_default>
|
263 |
+
<show_in_website>1</show_in_website>
|
264 |
+
<show_in_store>1</show_in_store>
|
265 |
+
</handlingfee>
|
266 |
+
<handlingoption translate="label">
|
267 |
+
<label>Handling Fee Apply As</label>
|
268 |
+
<frontend_type>select</frontend_type>
|
269 |
+
<source_model>pb_pbgsp/handlingoptions</source_model>
|
270 |
+
<sort_order>242</sort_order>
|
271 |
+
<show_in_default>1</show_in_default>
|
272 |
+
<show_in_website>1</show_in_website>
|
273 |
+
<show_in_store>1</show_in_store>
|
274 |
+
</handlingoption>
|
275 |
+
<domestic_shipping_fee translate="label">
|
276 |
+
<label>Domestic Shipping Fee</label>
|
277 |
+
<frontend_type>text</frontend_type>
|
278 |
+
<sort_order>243</sort_order>
|
279 |
+
<show_in_default>1</show_in_default>
|
280 |
+
<show_in_website>1</show_in_website>
|
281 |
+
<show_in_store>1</show_in_store>
|
282 |
+
</domestic_shipping_fee>
|
283 |
+
<domestic_shipping_option translate="label">
|
284 |
+
<label>Apply Domestic shipping fee as</label>
|
285 |
+
<frontend_type>select</frontend_type>
|
286 |
+
<source_model>pb_pbgsp/handlingoptions</source_model>
|
287 |
+
<sort_order>244</sort_order>
|
288 |
+
<show_in_default>1</show_in_default>
|
289 |
+
<show_in_website>1</show_in_website>
|
290 |
+
<show_in_store>1</show_in_store>
|
291 |
+
</domestic_shipping_option>
|
292 |
+
<delivery_adjustment_min_days translate="label">
|
293 |
+
<label>Minimum Delivery Days to PB Hub</label>
|
294 |
+
<frontend_type>text</frontend_type>
|
295 |
+
<validate>validate-number</validate>
|
296 |
+
<sort_order>245</sort_order>
|
297 |
+
<show_in_default>1</show_in_default>
|
298 |
+
<show_in_website>1</show_in_website>
|
299 |
+
<show_in_store>1</show_in_store>
|
300 |
+
</delivery_adjustment_min_days>
|
301 |
+
<delivery_adjustment_max_days translate="label">
|
302 |
+
<label>Maximum Delivery Days to PB Hub</label>
|
303 |
+
<frontend_type>text</frontend_type>
|
304 |
+
<validate>validate-number</validate>
|
305 |
+
<sort_order>246</sort_order>
|
306 |
+
<show_in_default>1</show_in_default>
|
307 |
+
<show_in_website>1</show_in_website>
|
308 |
+
<show_in_store>1</show_in_store>
|
309 |
+
</delivery_adjustment_max_days>
|
310 |
+
<!-- added by BigPixel 6/5/2012 -->
|
311 |
+
<sallowspecific translate="label">
|
312 |
+
<label>Ship to applicable countries</label>
|
313 |
+
<frontend_type>select</frontend_type>
|
314 |
+
<sort_order>250</sort_order>
|
315 |
+
<frontend_class>shipping-applicable-country</frontend_class>
|
316 |
+
<source_model>adminhtml/system_config_source_shipping_allspecificcountries</source_model>
|
317 |
+
<show_in_default>1</show_in_default>
|
318 |
+
<show_in_website>1</show_in_website>
|
319 |
+
<show_in_store>1</show_in_store>
|
320 |
+
</sallowspecific>
|
321 |
+
<specificcountry translate="label">
|
322 |
+
<label>Ship to Specific countries</label>
|
323 |
+
<frontend_type>multiselect</frontend_type>
|
324 |
+
<sort_order>251</sort_order>
|
325 |
+
<source_model>adminhtml/system_config_source_country</source_model>
|
326 |
+
<show_in_default>1</show_in_default>
|
327 |
+
<show_in_website>1</show_in_website>
|
328 |
+
<show_in_store>1</show_in_store>
|
329 |
+
</specificcountry>
|
330 |
+
<showmethod translate="label">
|
331 |
+
<label>Show Method if Not Applicable</label>
|
332 |
+
<frontend_type>select</frontend_type>
|
333 |
+
<sort_order>260</sort_order>
|
334 |
+
<frontend_class>shipping-skip-hide</frontend_class>
|
335 |
+
<source_model>adminhtml/system_config_source_yesno</source_model>
|
336 |
+
<show_in_default>1</show_in_default>
|
337 |
+
<show_in_website>1</show_in_website>
|
338 |
+
<show_in_store>0</show_in_store>
|
339 |
+
</showmethod>
|
340 |
+
<specificerrmsg translate="label">
|
341 |
+
<label>Displayed Error Message</label>
|
342 |
+
<frontend_type>textarea</frontend_type>
|
343 |
+
<sort_order>270</sort_order>
|
344 |
+
<show_in_default>1</show_in_default>
|
345 |
+
<show_in_website>1</show_in_website>
|
346 |
+
<show_in_store>1</show_in_store>
|
347 |
+
</specificerrmsg>
|
348 |
+
<!-- test comments -->
|
349 |
+
<trackinglink translate="label">
|
350 |
+
<label>Enable Tracking Links</label>
|
351 |
+
<frontend_type>select</frontend_type>
|
352 |
+
<source_model>adminhtml/system_config_source_yesno</source_model>
|
353 |
+
<sort_order>271</sort_order>
|
354 |
+
<show_in_default>1</show_in_default>
|
355 |
+
<show_in_website>1</show_in_website>
|
356 |
+
<show_in_store>1</show_in_store>
|
357 |
+
</trackinglink>
|
358 |
+
<suppress_domestic_tracking translate="label">
|
359 |
+
<label>Suppress Domestic Leg Tracking</label>
|
360 |
+
<frontend_type>select</frontend_type>
|
361 |
+
<sort_order>280</sort_order>
|
362 |
+
<frontend_class>shipping-skip-hide</frontend_class>
|
363 |
+
<source_model>adminhtml/system_config_source_yesno</source_model>
|
364 |
+
<show_in_default>1</show_in_default>
|
365 |
+
<show_in_website>1</show_in_website>
|
366 |
+
<show_in_store>1</show_in_store>
|
367 |
+
</suppress_domestic_tracking>
|
368 |
+
<custom_shipment_email_subject translate="label">
|
369 |
+
<label>Custom Shipment Email Subject</label>
|
370 |
+
<frontend_type>text</frontend_type>
|
371 |
+
|
372 |
+
<sort_order>281</sort_order>
|
373 |
+
<show_in_default>1</show_in_default>
|
374 |
+
<show_in_website>1</show_in_website>
|
375 |
+
<show_in_store>1</show_in_store>
|
376 |
+
</custom_shipment_email_subject>
|
377 |
+
<custom_shipment_email_template>
|
378 |
+
<label>Custom Shipment Email</label>
|
379 |
+
<frontend_type>textarea</frontend_type>
|
380 |
+
<sort_order>282</sort_order>
|
381 |
+
<show_in_default>1</show_in_default>
|
382 |
+
<show_in_website>1</show_in_website>
|
383 |
+
<show_in_store>1</show_in_store>
|
384 |
+
</custom_shipment_email_template>
|
385 |
+
<separate_log_file translate="label">
|
386 |
+
<label>Log in separate file</label>
|
387 |
+
<frontend_type>select</frontend_type>
|
388 |
+
<sort_order>283</sort_order>
|
389 |
+
<frontend_class>shipping-skip-hide</frontend_class>
|
390 |
+
<source_model>adminhtml/system_config_source_yesno</source_model>
|
391 |
+
<show_in_default>1</show_in_default>
|
392 |
+
<show_in_website>1</show_in_website>
|
393 |
+
<show_in_store>1</show_in_store>
|
394 |
+
</separate_log_file>
|
395 |
+
<return_address_street1 translate="label">
|
396 |
+
<label>Return Address Street 1</label>
|
397 |
+
<frontend_type>text</frontend_type>
|
398 |
+
|
399 |
+
<sort_order>284</sort_order>
|
400 |
+
<show_in_default>1</show_in_default>
|
401 |
+
<show_in_website>1</show_in_website>
|
402 |
+
<show_in_store>1</show_in_store>
|
403 |
+
</return_address_street1>
|
404 |
+
<return_address_city translate="label">
|
405 |
+
<label>Return Address City</label>
|
406 |
+
<frontend_type>text</frontend_type>
|
407 |
+
|
408 |
+
<sort_order>285</sort_order>
|
409 |
+
<show_in_default>1</show_in_default>
|
410 |
+
<show_in_website>1</show_in_website>
|
411 |
+
<show_in_store>1</show_in_store>
|
412 |
+
</return_address_city>
|
413 |
+
<return_address_state translate="label">
|
414 |
+
<label>Province/State</label>
|
415 |
+
<frontend_type>text</frontend_type>
|
416 |
+
|
417 |
+
<sort_order>286</sort_order>
|
418 |
+
<show_in_default>1</show_in_default>
|
419 |
+
<show_in_website>1</show_in_website>
|
420 |
+
<show_in_store>1</show_in_store>
|
421 |
+
</return_address_state>
|
422 |
+
<return_address_country translate="label">
|
423 |
+
<label>Country</label>
|
424 |
+
<frontend_type>select</frontend_type>
|
425 |
+
<source_model>adminhtml/system_config_source_country</source_model>
|
426 |
+
<sort_order>287</sort_order>
|
427 |
+
<show_in_default>1</show_in_default>
|
428 |
+
<show_in_website>1</show_in_website>
|
429 |
+
<show_in_store>1</show_in_store>
|
430 |
+
</return_address_country>
|
431 |
+
<return_address_zip translate="label">
|
432 |
+
<label>Zip or Postal Code</label>
|
433 |
+
<frontend_type>text</frontend_type>
|
434 |
+
|
435 |
+
<sort_order>288</sort_order>
|
436 |
+
<show_in_default>1</show_in_default>
|
437 |
+
<show_in_website>1</show_in_website>
|
438 |
+
<show_in_store>1</show_in_store>
|
439 |
+
</return_address_zip>
|
440 |
+
</fields>
|
441 |
+
</pbgsp>
|
442 |
+
</groups>
|
443 |
+
</carriers>
|
444 |
+
|
445 |
+
</sections>
|
446 |
+
</config>
|
app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php
CHANGED
@@ -1,8 +1,8 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
* Product: Pb_Pbgsp (1.1.
|
4 |
-
* Packaged: 2015-09-
|
5 |
-
* Last Modified: 2015-09-
|
6 |
|
7 |
|
8 |
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.1.2)
|
4 |
+
* Packaged: 2015-09-23T12:09:53+00:00
|
5 |
+
* Last Modified: 2015-09-14T12:11:20+00:00
|
6 |
|
7 |
|
8 |
|
app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.0.0-1.0.1.php
CHANGED
@@ -1,8 +1,8 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
* Product: Pb_Pbgsp (1.1.
|
4 |
-
* Packaged: 2015-09-
|
5 |
-
* Last Modified: 2015-09-
|
6 |
|
7 |
|
8 |
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.1.2)
|
4 |
+
* Packaged: 2015-09-23T12:09:53+00:00
|
5 |
+
* Last Modified: 2015-09-14T12:11:20+00:00
|
6 |
|
7 |
|
8 |
|
app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.1.1-1.1.2.php
ADDED
@@ -0,0 +1,28 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* Product: Pb_Pbgsp (1.1.2)
|
4 |
+
* Packaged: 2015-09-23T12:09:53+00:00
|
5 |
+
* Last Modified: 2015-09-14T12:11:20+00:00
|
6 |
+
|
7 |
+
|
8 |
+
|
9 |
+
|
10 |
+
* File: app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php
|
11 |
+
* Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
|
12 |
+
*/
|
13 |
+
|
14 |
+
|
15 |
+
$installer = $this;
|
16 |
+
|
17 |
+
$installer->startSetup();
|
18 |
+
|
19 |
+
$installer->run("
|
20 |
+
|
21 |
+
Alter TABLE {$this->getTable('pb_pbgsp/inboundparcel')} add `mage_order_shipment_number` varchar(50) null;
|
22 |
+
|
23 |
+
|
24 |
+
|
25 |
+
");
|
26 |
+
|
27 |
+
$installer->endSetup();
|
28 |
+
?>
|
package.xml
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>pitneybowes_gsp</name>
|
4 |
-
<version>1.1.
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License (OSL)</license>
|
7 |
<channel>community</channel>
|
@@ -24,12 +24,14 @@ To learn more, go to <a href="http://www.pb.com/ecom">http://www.pb.com/ec
|
|
24 |
</description>
|
25 |
<notes>Patch release for Magento Connect.
|
26 |

|
27 |
-
1.
|
|
|
|
|
28 |
</notes>
|
29 |
<authors><author><name>Raymond Lai</name><user>r3lai</user><email>raymond.lai@pb.com</email></author></authors>
|
30 |
-
<date>2015-09-
|
31 |
-
<time>
|
32 |
-
<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="
|
33 |
<compatible/>
|
34 |
<dependencies><required><php><min>5.1.0</min><max>5.6.0</max></php></required></dependencies>
|
35 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>pitneybowes_gsp</name>
|
4 |
+
<version>1.1.2</version>
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License (OSL)</license>
|
7 |
<channel>community</channel>
|
24 |
</description>
|
25 |
<notes>Patch release for Magento Connect.
|
26 |

|
27 |
+
1. Integrated validation for title field in configuration page to resolve PHP 5.3 will warning when there is an empty string
|
28 |
+

|
29 |
+
2. Added a cron job to check for shipped PB orders that have no ASNs (tracking numbers) and attempt to create.
|
30 |
</notes>
|
31 |
<authors><author><name>Raymond Lai</name><user>r3lai</user><email>raymond.lai@pb.com</email></author></authors>
|
32 |
+
<date>2015-09-23</date>
|
33 |
+
<time>09:12:23</time>
|
34 |
+
<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="8ab84a0f0cb90a789c070c56a8aa98a6"/></dir><file name="Totals.php" hash="1e8e96536ee19bb5dd63ab6eda700643"/></dir></dir></dir><dir name="Checkout"><dir name="Shipping"><dir name="Method"><file name="Available.php" hash="af424c7537c48e18fe6263d74c54e1fe"/></dir></dir></dir><file name="Form.php" hash="58e83cab0de71d6cc5afec9a60afd09c"/><dir name="Sales"><dir name="Order"><dir name="Invoice"><file name="Totals.php" hash="9338271819f701d9d5c262bf1169309c"/></dir><file name="Totals.php" hash="637038d37fd4177cd6709d446bc9b3af"/></dir></dir></dir><dir name="Model"><file name="Api.php" hash="742f69113031ce0634221c3984f72de8"/><file name="Authapioptions.php" hash="8cd4e0e89c1bc6b5ca12d502386c89a2"/><dir name="Carrier"><file name="ShippingMethod.php" hash="23731ef28af943b98882a578806a7dce"/></dir><dir name="Catalog"><file name="Category.php" hash="2e5ccc49d8db68b842e55f17a3133bed"/><file name="Cron.php" hash="2e6558d7ef8f1eb67e698c01cdbbf443"/><file name="File.php" hash="802a1e04cdcbfa03c751134967ee8d97"/><file name="Product.php" hash="be61ca172bea55d211378e115094412c"/></dir><file name="Credentials.php" hash="e803b610c868d6fab41453181d6601b7"/><dir name="Creditmemo"><file name="Duty.php" hash="b9386a05a58fec625a882124b7b7eaaf"/></dir><file name="Handlingoptions.php" hash="9fd861980e227ee515c3fa5b1d1c4367"/><file name="Helper.php" hash="b593554885558b7869b061531c9f4635"/><file name="Inboundparcel.php" hash="6e8359494a8835920af4fc9952da4fd8"/><dir name="Invoice"><file name="Duty.php" hash="746f327895d0a17d20d254cb734bebe9"/></dir><file name="Messages.php" hash="050a5919049d5c1384a199d7c74e684e"/><dir name="Mysql4"><dir name="Inboundparcel"><file name="Collection.php" hash="b69d5f58ae74f5e0c5e0795bc05cd634"/></dir><file name="Inboundparcel.php" hash="88086d87454e4387ac06e2122b014aa0"/><dir name="Ordernumber"><file name="Collection.php" hash="25f36a5eda8d948af55a71714600f899"/></dir><file name="Ordernumber.php" hash="1090339fc2d318bc8e3cf584e3eae613"/><dir name="Variable"><file name="Collection.php" hash="f4adfab8b49a87146790c086732b3c61"/></dir><file name="Variable.php" hash="c4eb21689279b74abdb0bc8ddc7b8bf3"/></dir><file name="Observer.php" hash="2780be538ad88d58f3c051189324832c"/><file name="Ordernumber.php" hash="503d6eaee5d7b8a5d2864ce89278d5be"/><dir name="Pdf"><file name="Tax.php" hash="808dfb5b91f55f988f56f81efbe5a60f"/></dir><dir name="Quote"><file name="Duty.php" hash="9498d9f2139c3cd1efd6fa09a797a9ca"/></dir><dir name="Resource"><dir name="Mysql4"><file name="Setup.php" hash="390c18c3ac49dcb2e58c02e008bfabf3"/></dir></dir><dir name="Sales"><dir name="Order"><file name="Shipment.php" hash="d539276b76e18e29650e752e90cca8c8"/></dir></dir><file name="Util.php" hash="fab2ec90f3811b9d06e82d846d9a677e"/><file name="Variable.php" hash="726abe7a2799e908c533e2291e6c2731"/></dir><dir name="data"><dir name="pb_pbgsp_setup"><file name="data-install-1.0.0.php" hash="acc1c1d2b3bd26a689a16362e17e6156"/></dir></dir><dir name="etc"><file name="config.xml" hash="5eb8e33a378e9efca63147a53842789e"/><file name="system.xml" hash="d5903ba4e10cf079e83c630ee64915fd"/></dir><dir name="sql"><dir name="pbgsp_setup"><file name="mysql4-install-1.0.0.php" hash="83386f7fcdfeff8ab43c97604584d977"/><file name="mysql4-upgrade-1.0.0-1.0.1.php" hash="a10ace43727a9c10b8a1a7299dfc32db"/><file name="mysql4-upgrade-1.1.1-1.1.2.php" hash="f6e63f3b2d72f949039e4a9b8141215c"/></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><target name="mageweb"><dir name="."><file name="ReadMe.txt" hash="9d657805471840b8eeba8c2c5e84870c"/></dir></target></contents>
|
35 |
<compatible/>
|
36 |
<dependencies><required><php><min>5.1.0</min><max>5.6.0</max></php></required></dependencies>
|
37 |
</package>
|