Version Notes
Stable Release
Download this release
Release Info
Developer | Kristian Büsch |
Extension | BillSAFE_3 |
Version | 14.09.15 |
Comparing to | |
See all releases |
Code changes from version 14.04.24 to 14.09.15
- app/code/community/Netresearch/Billsafe/Model/Config/Abstract.php +16 -15
- app/code/community/Netresearch/Billsafe/Model/Config/Maxamount.php +7 -7
- app/code/community/Netresearch/Billsafe/Model/Config/Maxfee.php +8 -9
- app/code/community/Netresearch/Billsafe/Model/Payment.php +3 -1
- app/code/community/Netresearch/Billsafe/Test/Model/ConfigTest/MaxAmountTest.php +168 -190
- app/code/community/Netresearch/Billsafe/Test/Model/Direct/PaymentTest.php +4 -5
- app/code/community/Netresearch/Billsafe/etc/config.xml +1 -1
- doc/Netresearch_Billsafe/ChangeLog.pdf +232 -154
- doc/Netresearch_Billsafe/README.pdf +2 -2
- package.xml +1 -1
- skin/frontend/base/default/css/billsafe.css +2 -1
app/code/community/Netresearch/Billsafe/Model/Config/Abstract.php
CHANGED
@@ -11,7 +11,7 @@ class Netresearch_Billsafe_Model_Config_Abstract extends Mage_Core_Model_Config_
|
|
11 |
protected $_config;
|
12 |
protected $_dataHelper;
|
13 |
protected $_customerHelper;
|
14 |
-
|
15 |
|
16 |
|
17 |
/**
|
@@ -72,13 +72,10 @@ class Netresearch_Billsafe_Model_Config_Abstract extends Mage_Core_Model_Config_
|
|
72 |
}
|
73 |
|
74 |
|
75 |
-
|
76 |
-
protected $_realConfigData = array();
|
77 |
-
|
78 |
/**
|
79 |
* apply new settings temporarily
|
80 |
*
|
81 |
-
* @return
|
82 |
*/
|
83 |
protected function getTempConfig()
|
84 |
{
|
@@ -90,10 +87,11 @@ class Netresearch_Billsafe_Model_Config_Abstract extends Mage_Core_Model_Config_
|
|
90 |
&& 1 == $newConfigData['active']
|
91 |
) {
|
92 |
// save old values
|
93 |
-
$this->_realConfigData
|
94 |
-
$this->_realConfigData
|
95 |
-
$this->_realConfigData
|
96 |
-
$this->_realConfigData
|
|
|
97 |
// temporarily set new values
|
98 |
$store->setConfig(Netresearch_Billsafe_Model_Config::CONFIG_PATH_MERCHAND_ID, $newConfigData['merchant_id']);
|
99 |
$store->setConfig(Netresearch_Billsafe_Model_Config::CONFIG_PATH_MERCHAND_LICENSE, $newConfigData['merchant_license']);
|
@@ -107,11 +105,14 @@ class Netresearch_Billsafe_Model_Config_Abstract extends Mage_Core_Model_Config_
|
|
107 |
|
108 |
protected function restoreConfig()
|
109 |
{
|
110 |
-
|
111 |
-
$
|
112 |
-
|
113 |
-
|
114 |
-
|
115 |
-
|
|
|
|
|
|
|
116 |
}
|
117 |
}
|
11 |
protected $_config;
|
12 |
protected $_dataHelper;
|
13 |
protected $_customerHelper;
|
14 |
+
protected $_realConfigData = null;
|
15 |
|
16 |
|
17 |
/**
|
72 |
}
|
73 |
|
74 |
|
|
|
|
|
|
|
75 |
/**
|
76 |
* apply new settings temporarily
|
77 |
*
|
78 |
+
* @return Netresearch_Billsafe_Model_Config
|
79 |
*/
|
80 |
protected function getTempConfig()
|
81 |
{
|
87 |
&& 1 == $newConfigData['active']
|
88 |
) {
|
89 |
// save old values
|
90 |
+
$this->_realConfigData = new Varien_Object();
|
91 |
+
$this->_realConfigData->setActive($store->getConfig(Netresearch_Billsafe_Model_Config::CONFIG_PATH_ACTIVE));
|
92 |
+
$this->_realConfigData->setFeeActive($store->getConfig(Netresearch_Billsafe_Model_Config::CONFIG_PATH_PAYMENT_FEE_ACTIVE));
|
93 |
+
$this->_realConfigData->setMerchantId($store->getConfig(Netresearch_Billsafe_Model_Config::CONFIG_PATH_MERCHAND_ID));
|
94 |
+
$this->_realConfigData->setMerchantLicense($store->getConfig(Netresearch_Billsafe_Model_Config::CONFIG_PATH_MERCHAND_LICENSE));
|
95 |
// temporarily set new values
|
96 |
$store->setConfig(Netresearch_Billsafe_Model_Config::CONFIG_PATH_MERCHAND_ID, $newConfigData['merchant_id']);
|
97 |
$store->setConfig(Netresearch_Billsafe_Model_Config::CONFIG_PATH_MERCHAND_LICENSE, $newConfigData['merchant_license']);
|
105 |
|
106 |
protected function restoreConfig()
|
107 |
{
|
108 |
+
// restore the data just in case we have config data to set
|
109 |
+
if ($this->_realConfigData instanceof Varien_Object) {
|
110 |
+
$scopeId = $this->getScopeId();
|
111 |
+
$store = Mage::app()->getStore($scopeId);
|
112 |
+
$store->setConfig(Netresearch_Billsafe_Model_Config::CONFIG_PATH_MERCHAND_ID, $this->_realConfigData->getMerchantId());
|
113 |
+
$store->setConfig(Netresearch_Billsafe_Model_Config::CONFIG_PATH_MERCHAND_LICENSE, $this->_realConfigData->getMerchantLicense());
|
114 |
+
$store->setConfig(Netresearch_Billsafe_Model_Config::CONFIG_PATH_ACTIVE, $this->_realConfigData->getActive());
|
115 |
+
$store->setConfig(Netresearch_Billsafe_Model_Config::CONFIG_PATH_PAYMENT_FEE_ACTIVE, $this->_realConfigData->getFeeActive());
|
116 |
+
}
|
117 |
}
|
118 |
}
|
app/code/community/Netresearch/Billsafe/Model/Config/Maxamount.php
CHANGED
@@ -17,7 +17,7 @@ class Netresearch_Billsafe_Model_Config_Maxamount extends Netresearch_Billsafe_M
|
|
17 |
{
|
18 |
$config = $this->getTempConfig();
|
19 |
$max = $this->getMax();
|
20 |
-
if ($max < $this->getValue()) {
|
21 |
$this->setValue($max);
|
22 |
}
|
23 |
$this->restoreConfig();
|
@@ -45,17 +45,17 @@ class Netresearch_Billsafe_Model_Config_Maxamount extends Netresearch_Billsafe_M
|
|
45 |
$msg = 'Maximum order amount is a required entry!';
|
46 |
throw new Netresearch_Billsafe_Model_Config_Exception(Mage::helper('billsafe')->__($msg));
|
47 |
}
|
|
|
48 |
$max = $this->getMax();
|
49 |
if (is_null($max)) {
|
50 |
-
|
51 |
-
'No connection to BillSAFE. Please check your credentials.'
|
52 |
-
));
|
53 |
}
|
|
|
54 |
if ($max < $this->getValue()) {
|
55 |
$msg = 'Maximum order amount exceeds the allowed maximum by BillSAFE of %s.';
|
56 |
-
throw new Netresearch_Billsafe_Model_Config_Exception(
|
57 |
-
|
58 |
-
)
|
59 |
}
|
60 |
|
61 |
$this->restoreConfig();
|
17 |
{
|
18 |
$config = $this->getTempConfig();
|
19 |
$max = $this->getMax();
|
20 |
+
if ($max && ($max < $this->getValue())) {
|
21 |
$this->setValue($max);
|
22 |
}
|
23 |
$this->restoreConfig();
|
45 |
$msg = 'Maximum order amount is a required entry!';
|
46 |
throw new Netresearch_Billsafe_Model_Config_Exception(Mage::helper('billsafe')->__($msg));
|
47 |
}
|
48 |
+
|
49 |
$max = $this->getMax();
|
50 |
if (is_null($max)) {
|
51 |
+
$max = INF;
|
|
|
|
|
52 |
}
|
53 |
+
|
54 |
if ($max < $this->getValue()) {
|
55 |
$msg = 'Maximum order amount exceeds the allowed maximum by BillSAFE of %s.';
|
56 |
+
throw new Netresearch_Billsafe_Model_Config_Exception(
|
57 |
+
Mage::helper('billsafe')->__($msg, $max)
|
58 |
+
);
|
59 |
}
|
60 |
|
61 |
$this->restoreConfig();
|
app/code/community/Netresearch/Billsafe/Model/Config/Maxfee.php
CHANGED
@@ -20,7 +20,7 @@ class Netresearch_Billsafe_Model_Config_Maxfee
|
|
20 |
$config = $this->getTempConfig();
|
21 |
if ($config->isPaymentFeeEnabled()) {
|
22 |
$max = $this->getMaxFee();
|
23 |
-
if ($max < $this->getValue()) {
|
24 |
$this->setValue($max);
|
25 |
}
|
26 |
}
|
@@ -47,18 +47,17 @@ class Netresearch_Billsafe_Model_Config_Maxfee
|
|
47 |
$msg = 'Maximum/Default fee is required entry!';
|
48 |
throw new Netresearch_Billsafe_Model_Config_Exception($dataHelper->__($msg));
|
49 |
}
|
|
|
50 |
$max = $this->getMaxFee();
|
51 |
if (is_null($max)) {
|
52 |
-
|
53 |
-
'No connection to BillSAFE. Please check your credentials.'
|
54 |
-
));
|
55 |
}
|
|
|
56 |
if ($max < $this->getValue()) {
|
57 |
-
$msg
|
58 |
-
|
59 |
-
|
60 |
-
|
61 |
-
));
|
62 |
}
|
63 |
}
|
64 |
$this->restoreConfig();
|
20 |
$config = $this->getTempConfig();
|
21 |
if ($config->isPaymentFeeEnabled()) {
|
22 |
$max = $this->getMaxFee();
|
23 |
+
if ($max && ($max < $this->getValue())) {
|
24 |
$this->setValue($max);
|
25 |
}
|
26 |
}
|
47 |
$msg = 'Maximum/Default fee is required entry!';
|
48 |
throw new Netresearch_Billsafe_Model_Config_Exception($dataHelper->__($msg));
|
49 |
}
|
50 |
+
|
51 |
$max = $this->getMaxFee();
|
52 |
if (is_null($max)) {
|
53 |
+
$max = INF;
|
|
|
|
|
54 |
}
|
55 |
+
|
56 |
if ($max < $this->getValue()) {
|
57 |
+
$msg = 'Maximum/Default fee %s exceeded the allowed maximum by BillSAFE of %s.';
|
58 |
+
throw new Netresearch_Billsafe_Model_Config_Exception(
|
59 |
+
$dataHelper->__($msg, $this->getValue(), $max)
|
60 |
+
);
|
|
|
61 |
}
|
62 |
}
|
63 |
$this->restoreConfig();
|
app/code/community/Netresearch/Billsafe/Model/Payment.php
CHANGED
@@ -519,7 +519,9 @@ class Netresearch_Billsafe_Model_Payment extends Mage_Payment_Model_Method_Abstr
|
|
519 |
*/
|
520 |
public function cancel(Varien_Object $payment)
|
521 |
{
|
522 |
-
|
|
|
|
|
523 |
return parent::cancel($payment);
|
524 |
}
|
525 |
|
519 |
*/
|
520 |
public function cancel(Varien_Object $payment)
|
521 |
{
|
522 |
+
if ($payment->getOrder()->getState() !== Mage_Sales_Model_Order::STATE_PAYMENT_REVIEW) {
|
523 |
+
$this->getClient()->void($payment->getOrder());
|
524 |
+
}
|
525 |
return parent::cancel($payment);
|
526 |
}
|
527 |
|
app/code/community/Netresearch/Billsafe/Test/Model/ConfigTest/MaxAmountTest.php
CHANGED
@@ -1,190 +1,168 @@
|
|
1 |
-
<?php
|
2 |
-
|
3 |
-
class Netresearch_Billsafe_Test_Model_ConfigTest_MaxAmountTest
|
4 |
-
extends EcomDev_PHPUnit_Test_Case
|
5 |
-
{
|
6 |
-
const MERCHANT_ID = '23244';
|
7 |
-
const MERCHANT_LICENSE = '2bef0c94d24cd9d7a6a0073e9926da46';
|
8 |
-
const ACCOUT_MAX_AMOUNT = 1025;
|
9 |
-
|
10 |
-
|
11 |
-
protected $_configMock;
|
12 |
-
|
13 |
-
public function setUp()
|
14 |
-
{
|
15 |
-
$this->_configMock = $this->getModelMock('billsafe/config',
|
16 |
-
array('isActive', 'getMerchantId', 'getMerchantLicense', 'getPaymentFeeEnabled'));
|
17 |
-
$this->_configMock->expects($this->any())
|
18 |
-
->method('isActive')
|
19 |
-
->will($this->returnValue(true));
|
20 |
-
$this->_configMock->expects($this->any())
|
21 |
-
->method('getMerchantId')
|
22 |
-
->will($this->returnValue(self::MERCHANT_ID));
|
23 |
-
$this->_configMock->expects($this->any())
|
24 |
-
->method('getMerchantLicense')
|
25 |
-
->will($this->returnValue(self::MERCHANT_LICENSE));
|
26 |
-
$this->_configMock->expects($this->any())
|
27 |
-
->method('getPaymentFeeEnabled')
|
28 |
-
->will($this->returnValue(true));
|
29 |
-
parent::setUp();
|
30 |
-
}
|
31 |
-
|
32 |
-
/**
|
33 |
-
* @test
|
34 |
-
* @expectedException Netresearch_Billsafe_Model_Config_Exception
|
35 |
-
* @expectedExceptionMessage Please enter your BillSAFE credentials.
|
36 |
-
*/
|
37 |
-
public function missingCredentialsTest()
|
38 |
-
{
|
39 |
-
$configMock = $this->getModelMock('billsafe/config',
|
40 |
-
array('isActive', 'getMerchantId', 'getMerchantLicense')
|
41 |
-
);
|
42 |
-
$configMock->expects($this->any())
|
43 |
-
->method('isActive')
|
44 |
-
->will($this->returnValue(true));
|
45 |
-
$configMock->expects($this->any())
|
46 |
-
->method('getMerchantId')
|
47 |
-
->will($this->returnValue(''));
|
48 |
-
$configMock->expects($this->any())
|
49 |
-
->method('getMerchantLicense')
|
50 |
-
->will($this->returnValue(''));
|
51 |
-
$maxAmountMock = $this->getModelMock('billsafe/config_maxamount',
|
52 |
-
array('getTempConfig')
|
53 |
-
);
|
54 |
-
$maxAmountMock->expects($this->once())
|
55 |
-
->method('getTempConfig')
|
56 |
-
->will($this->returnValue($configMock));
|
57 |
-
$maxAmountMock->_beforeSave();
|
58 |
-
}
|
59 |
-
/**
|
60 |
-
* @test
|
61 |
-
* @expectedException Netresearch_Billsafe_Model_Config_Exception
|
62 |
-
* @expectedExceptionMessage Maximum order amount is a required entry!
|
63 |
-
*/
|
64 |
-
public function missingMaxAmountTest()
|
65 |
-
{
|
66 |
-
$maxAmountMock = $this->getModelMock('billsafe/config_maxamount',
|
67 |
-
array('getTempConfig', 'getValue')
|
68 |
-
);
|
69 |
-
$maxAmountMock->expects($this->once())
|
70 |
-
->method('getTempConfig')
|
71 |
-
->will($this->returnValue($this->_configMock));
|
72 |
-
$maxAmountMock->expects($this->any())
|
73 |
-
->method('getValue')
|
74 |
-
->will($this->returnValue(''));
|
75 |
-
$maxAmountMock->_beforeSave();
|
76 |
-
}
|
77 |
-
/**
|
78 |
-
* @test
|
79 |
-
* @expectedException Netresearch_Billsafe_Model_Config_Exception
|
80 |
-
* @expectedExceptionMessage
|
81 |
-
*/
|
82 |
-
public function
|
83 |
-
{
|
84 |
-
|
85 |
-
|
86 |
-
|
87 |
-
|
88 |
-
|
89 |
-
->
|
90 |
-
|
91 |
-
|
92 |
-
->
|
93 |
-
|
94 |
-
|
95 |
-
->
|
96 |
-
|
97 |
-
|
98 |
-
|
99 |
-
|
100 |
-
|
101 |
-
|
102 |
-
|
103 |
-
|
104 |
-
|
105 |
-
|
106 |
-
$maxAmountMock
|
107 |
-
|
108 |
-
);
|
109 |
-
$maxAmountMock->expects($this->
|
110 |
-
->method('
|
111 |
-
->will($this->returnValue(
|
112 |
-
$maxAmountMock->expects($this->any())
|
113 |
-
->method('
|
114 |
-
->will($this->returnValue(
|
115 |
-
$maxAmountMock->
|
116 |
-
|
117 |
-
|
118 |
-
|
119 |
-
|
120 |
-
|
121 |
-
|
122 |
-
|
123 |
-
|
124 |
-
|
125 |
-
$
|
126 |
-
|
127 |
-
|
128 |
-
$
|
129 |
-
|
130 |
-
|
131 |
-
|
132 |
-
|
133 |
-
|
134 |
-
$maxAmountMock
|
135 |
-
|
136 |
-
|
137 |
-
$maxAmountMock->
|
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 |
-
$maxAmountMock->expects($this->any())
|
163 |
-
->method('
|
164 |
-
->will($this->returnValue(
|
165 |
-
$maxAmountMock->
|
166 |
-
|
167 |
-
|
168 |
-
|
169 |
-
$this->assertEquals(1000, $maxAmountMock->getValue());
|
170 |
-
|
171 |
-
$maxAmountMock = $this->getModelMock('billsafe/config_maxamount',
|
172 |
-
array('getFieldSetData', 'getTempConfig', 'getMax', 'restoreConfig')
|
173 |
-
);
|
174 |
-
$maxAmountMock->expects($this->any())
|
175 |
-
->method('getFieldSetData')
|
176 |
-
->will($this->returnValue($fieldSetData));
|
177 |
-
|
178 |
-
$fakeTempConfig = new Varien_Object();
|
179 |
-
$fakeTempConfig->setMaxAmount(1025);
|
180 |
-
$maxAmountMock->expects($this->any())
|
181 |
-
->method('getTempConfig')
|
182 |
-
->will($this->returnValue($fakeTempConfig));
|
183 |
-
$maxAmountMock->setValue(2000);
|
184 |
-
$maxAmountMock->expects($this->any())
|
185 |
-
->method('getMax')
|
186 |
-
->will($this->returnValue(self::ACCOUT_MAX_AMOUNT));
|
187 |
-
$maxAmountMock->_afterLoad();
|
188 |
-
$this->assertEquals(self::ACCOUT_MAX_AMOUNT, $maxAmountMock->getValue());
|
189 |
-
}
|
190 |
-
}
|
1 |
+
<?php
|
2 |
+
|
3 |
+
class Netresearch_Billsafe_Test_Model_ConfigTest_MaxAmountTest
|
4 |
+
extends EcomDev_PHPUnit_Test_Case
|
5 |
+
{
|
6 |
+
const MERCHANT_ID = '23244';
|
7 |
+
const MERCHANT_LICENSE = '2bef0c94d24cd9d7a6a0073e9926da46';
|
8 |
+
const ACCOUT_MAX_AMOUNT = 1025;
|
9 |
+
|
10 |
+
|
11 |
+
protected $_configMock;
|
12 |
+
|
13 |
+
public function setUp()
|
14 |
+
{
|
15 |
+
$this->_configMock = $this->getModelMock('billsafe/config',
|
16 |
+
array('isActive', 'getMerchantId', 'getMerchantLicense', 'getPaymentFeeEnabled'));
|
17 |
+
$this->_configMock->expects($this->any())
|
18 |
+
->method('isActive')
|
19 |
+
->will($this->returnValue(true));
|
20 |
+
$this->_configMock->expects($this->any())
|
21 |
+
->method('getMerchantId')
|
22 |
+
->will($this->returnValue(self::MERCHANT_ID));
|
23 |
+
$this->_configMock->expects($this->any())
|
24 |
+
->method('getMerchantLicense')
|
25 |
+
->will($this->returnValue(self::MERCHANT_LICENSE));
|
26 |
+
$this->_configMock->expects($this->any())
|
27 |
+
->method('getPaymentFeeEnabled')
|
28 |
+
->will($this->returnValue(true));
|
29 |
+
parent::setUp();
|
30 |
+
}
|
31 |
+
|
32 |
+
/**
|
33 |
+
* @test
|
34 |
+
* @expectedException Netresearch_Billsafe_Model_Config_Exception
|
35 |
+
* @expectedExceptionMessage Please enter your BillSAFE credentials.
|
36 |
+
*/
|
37 |
+
public function missingCredentialsTest()
|
38 |
+
{
|
39 |
+
$configMock = $this->getModelMock('billsafe/config',
|
40 |
+
array('isActive', 'getMerchantId', 'getMerchantLicense')
|
41 |
+
);
|
42 |
+
$configMock->expects($this->any())
|
43 |
+
->method('isActive')
|
44 |
+
->will($this->returnValue(true));
|
45 |
+
$configMock->expects($this->any())
|
46 |
+
->method('getMerchantId')
|
47 |
+
->will($this->returnValue(''));
|
48 |
+
$configMock->expects($this->any())
|
49 |
+
->method('getMerchantLicense')
|
50 |
+
->will($this->returnValue(''));
|
51 |
+
$maxAmountMock = $this->getModelMock('billsafe/config_maxamount',
|
52 |
+
array('getTempConfig')
|
53 |
+
);
|
54 |
+
$maxAmountMock->expects($this->once())
|
55 |
+
->method('getTempConfig')
|
56 |
+
->will($this->returnValue($configMock));
|
57 |
+
$maxAmountMock->_beforeSave();
|
58 |
+
}
|
59 |
+
/**
|
60 |
+
* @test
|
61 |
+
* @expectedException Netresearch_Billsafe_Model_Config_Exception
|
62 |
+
* @expectedExceptionMessage Maximum order amount is a required entry!
|
63 |
+
*/
|
64 |
+
public function missingMaxAmountTest()
|
65 |
+
{
|
66 |
+
$maxAmountMock = $this->getModelMock('billsafe/config_maxamount',
|
67 |
+
array('getTempConfig', 'getValue')
|
68 |
+
);
|
69 |
+
$maxAmountMock->expects($this->once())
|
70 |
+
->method('getTempConfig')
|
71 |
+
->will($this->returnValue($this->_configMock));
|
72 |
+
$maxAmountMock->expects($this->any())
|
73 |
+
->method('getValue')
|
74 |
+
->will($this->returnValue(''));
|
75 |
+
$maxAmountMock->_beforeSave();
|
76 |
+
}
|
77 |
+
/**
|
78 |
+
* @test
|
79 |
+
* @expectedException Netresearch_Billsafe_Model_Config_Exception
|
80 |
+
* @expectedExceptionMessage Maximum order amount exceeds the allowed maximum by BillSAFE of 1025
|
81 |
+
*/
|
82 |
+
public function exeedingMaxAmountTest()
|
83 |
+
{
|
84 |
+
$maxAmountMock = $this->getModelMock('billsafe/config_maxamount',
|
85 |
+
array('getTempConfig', 'getValue', 'getMax')
|
86 |
+
);
|
87 |
+
$maxAmountMock->expects($this->once())
|
88 |
+
->method('getTempConfig')
|
89 |
+
->will($this->returnValue($this->_configMock));
|
90 |
+
$maxAmountMock->expects($this->any())
|
91 |
+
->method('getValue')
|
92 |
+
->will($this->returnValue(90000));
|
93 |
+
$maxAmountMock->expects($this->any())
|
94 |
+
->method('getMax')
|
95 |
+
->will($this->returnValue(self::ACCOUT_MAX_AMOUNT));
|
96 |
+
$maxAmountMock->_beforeSave();
|
97 |
+
}
|
98 |
+
/**
|
99 |
+
* @test
|
100 |
+
*/
|
101 |
+
public function beforeSaveTest()
|
102 |
+
{
|
103 |
+
$maxAmountMock = $this->getModelMock('billsafe/config_maxamount',
|
104 |
+
array('getTempConfig', 'getValue', 'getMax', 'restoreConfig')
|
105 |
+
);
|
106 |
+
$maxAmountMock->expects($this->once())
|
107 |
+
->method('getTempConfig')
|
108 |
+
->will($this->returnValue($this->_configMock));
|
109 |
+
$maxAmountMock->expects($this->any())
|
110 |
+
->method('getValue')
|
111 |
+
->will($this->returnValue(1000));
|
112 |
+
$maxAmountMock->expects($this->any())
|
113 |
+
->method('getMax')
|
114 |
+
->will($this->returnValue(1025));
|
115 |
+
$maxAmountMock->_beforeSave();
|
116 |
+
}
|
117 |
+
|
118 |
+
/**
|
119 |
+
* @test
|
120 |
+
*/
|
121 |
+
public function afterLoadTest()
|
122 |
+
{
|
123 |
+
$checkoutSessionMock = $this->getModelMock('checkout/session', array('init', 'save'));
|
124 |
+
$this->replaceByMock('model', 'checkout/session', $checkoutSessionMock);
|
125 |
+
$customerSessionMock = $this->getModelMock('customer/session', array('init', 'save'));
|
126 |
+
$this->replaceByMock('model', 'customer/session', $customerSessionMock);
|
127 |
+
|
128 |
+
$fieldSetData = array(
|
129 |
+
'active' => 1,
|
130 |
+
'merchant_id' => self::MERCHANT_ID,
|
131 |
+
'merchant_license' => self::MERCHANT_LICENSE,
|
132 |
+
'fee_active' => 0
|
133 |
+
);
|
134 |
+
$maxAmountMock = $this->getModelMock('billsafe/config_maxamount',
|
135 |
+
array('getFieldSetData', 'getValue', 'getMax')
|
136 |
+
);
|
137 |
+
$maxAmountMock->expects($this->any())
|
138 |
+
->method('getFieldSetData')
|
139 |
+
->will($this->returnValue($fieldSetData));
|
140 |
+
$maxAmountMock->expects($this->any())
|
141 |
+
->method('getValue')
|
142 |
+
->will($this->returnValue(1000));
|
143 |
+
$maxAmountMock->expects($this->any())
|
144 |
+
->method('getMax')
|
145 |
+
->will($this->returnValue(self::ACCOUT_MAX_AMOUNT));
|
146 |
+
$maxAmountMock->_afterLoad();
|
147 |
+
$this->assertEquals(1000, $maxAmountMock->getValue());
|
148 |
+
|
149 |
+
$maxAmountMock = $this->getModelMock('billsafe/config_maxamount',
|
150 |
+
array('getFieldSetData', 'getTempConfig', 'getMax', 'restoreConfig')
|
151 |
+
);
|
152 |
+
$maxAmountMock->expects($this->any())
|
153 |
+
->method('getFieldSetData')
|
154 |
+
->will($this->returnValue($fieldSetData));
|
155 |
+
|
156 |
+
$fakeTempConfig = new Varien_Object();
|
157 |
+
$fakeTempConfig->setMaxAmount(1025);
|
158 |
+
$maxAmountMock->expects($this->any())
|
159 |
+
->method('getTempConfig')
|
160 |
+
->will($this->returnValue($fakeTempConfig));
|
161 |
+
$maxAmountMock->setValue(2000);
|
162 |
+
$maxAmountMock->expects($this->any())
|
163 |
+
->method('getMax')
|
164 |
+
->will($this->returnValue(self::ACCOUT_MAX_AMOUNT));
|
165 |
+
$maxAmountMock->_afterLoad();
|
166 |
+
$this->assertEquals(self::ACCOUT_MAX_AMOUNT, $maxAmountMock->getValue());
|
167 |
+
}
|
168 |
+
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app/code/community/Netresearch/Billsafe/Test/Model/Direct/PaymentTest.php
CHANGED
@@ -15,15 +15,14 @@ class Netresearch_Billsafe_Test_Model_Direct_PaymentTest
|
|
15 |
->expects($this->any())
|
16 |
->method('getCreatedAt')
|
17 |
->will($this->returnValue($createdAtDate));
|
18 |
-
$this->replaceByMock('model', 'billsafe/direct_payment', $modelMock);
|
19 |
|
20 |
-
|
21 |
-
$
|
22 |
|
23 |
$date = new Zend_Date($createdAtDate, 'YYYY-MM-DD');
|
24 |
$this->assertEquals(
|
25 |
-
$date->toString(Zend_Date::
|
26 |
-
$
|
27 |
);
|
28 |
}
|
29 |
}
|
15 |
->expects($this->any())
|
16 |
->method('getCreatedAt')
|
17 |
->will($this->returnValue($createdAtDate));
|
|
|
18 |
|
19 |
+
$localeMock = Mage::app()->getLocale();
|
20 |
+
$localeMock->setLocale('de_DE');
|
21 |
|
22 |
$date = new Zend_Date($createdAtDate, 'YYYY-MM-DD');
|
23 |
$this->assertEquals(
|
24 |
+
$date->toString(Zend_Date::DATES, null, $localeMock->getLocale()),
|
25 |
+
$modelMock->getCreatedAtFormatted()
|
26 |
);
|
27 |
}
|
28 |
}
|
app/code/community/Netresearch/Billsafe/etc/config.xml
CHANGED
@@ -2,7 +2,7 @@
|
|
2 |
<config>
|
3 |
<modules>
|
4 |
<Netresearch_Billsafe>
|
5 |
-
<version>14.
|
6 |
</Netresearch_Billsafe>
|
7 |
</modules>
|
8 |
|
2 |
<config>
|
3 |
<modules>
|
4 |
<Netresearch_Billsafe>
|
5 |
+
<version>14.09.15</version>
|
6 |
</Netresearch_Billsafe>
|
7 |
</modules>
|
8 |
|
doc/Netresearch_Billsafe/ChangeLog.pdf
CHANGED
@@ -91,7 +91,7 @@ endobj
|
|
91 |
% 'R8': class PDFInfo
|
92 |
8 0 obj
|
93 |
<< /Author ()
|
94 |
-
/CreationDate (D:
|
95 |
/Keywords ()
|
96 |
/Producer (ReportLab http://www.reportlab.com)
|
97 |
/Subject (\(unspecified\))
|
@@ -108,7 +108,7 @@ endobj
|
|
108 |
% 'R10': class PDFStream
|
109 |
10 0 obj
|
110 |
% page stream
|
111 |
-
<< /Length
|
112 |
stream
|
113 |
1 0 0 1 0 0 cm BT /F1 12 Tf 14.4 TL ET
|
114 |
q
|
@@ -129,25 +129,25 @@ q
|
|
129 |
1 0 0 1 62.69291 638.3307 cm
|
130 |
Q
|
131 |
q
|
132 |
-
1 0 0 1 62.69291
|
133 |
1 1 1 rg
|
134 |
-
n 0
|
135 |
.878431 .878431 .878431 rg
|
136 |
-
n 0
|
137 |
1 1 1 rg
|
138 |
-
n 0
|
139 |
.878431 .878431 .878431 rg
|
140 |
-
n 0
|
141 |
1 1 1 rg
|
142 |
-
n 0
|
143 |
.878431 .878431 .878431 rg
|
144 |
-
n 0
|
145 |
.960784 .960784 .862745 rg
|
146 |
-
n 0
|
147 |
0 .533333 .603922 rg
|
148 |
BT /F1 10 Tf 12 TL ET
|
149 |
q
|
150 |
-
1 0 0 1 6
|
151 |
q
|
152 |
.960784 .960784 .862745 rg
|
153 |
n 0 0 46.73622 12 re f*
|
@@ -158,7 +158,7 @@ BT 1 0 0 1 0 4.82 Tm /F2 10 Tf 12 TL 2.52811 0 Td (Revision) Tj T* -2.52811 0 Td
|
|
158 |
Q
|
159 |
Q
|
160 |
q
|
161 |
-
1 0 0 1 64.73622
|
162 |
q
|
163 |
.960784 .960784 .862745 rg
|
164 |
n 0 0 46.73622 12 re f*
|
@@ -169,7 +169,7 @@ BT 1 0 0 1 0 4.82 Tm /F2 10 Tf 12 TL 12.53311 0 Td (Date) Tj T* -12.53311 0 Td E
|
|
169 |
Q
|
170 |
Q
|
171 |
q
|
172 |
-
1 0 0 1 123.4724
|
173 |
q
|
174 |
.960784 .960784 .862745 rg
|
175 |
n 0 0 340.4173 12 re f*
|
@@ -181,34 +181,109 @@ Q
|
|
181 |
Q
|
182 |
0 0 0 rg
|
183 |
q
|
184 |
-
1 0 0 1 6
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
185 |
q
|
186 |
0 0 0 rg
|
187 |
BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (14.04.24) Tj T* ET
|
188 |
Q
|
189 |
Q
|
190 |
q
|
191 |
-
1 0 0 1 64.73622
|
192 |
q
|
193 |
0 0 0 rg
|
194 |
BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (2014-04-24) Tj T* ET
|
195 |
Q
|
196 |
Q
|
197 |
q
|
198 |
-
1 0 0 1 123.4724
|
199 |
q
|
200 |
0 0 0 rg
|
201 |
BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Features:) Tj T* ET
|
202 |
Q
|
203 |
Q
|
204 |
q
|
205 |
-
1 0 0 1 123.4724
|
206 |
Q
|
207 |
q
|
208 |
-
1 0 0 1 123.4724
|
209 |
Q
|
210 |
q
|
211 |
-
1 0 0 1 123.4724
|
212 |
0 0 0 rg
|
213 |
BT /F1 10 Tf 12 TL ET
|
214 |
q
|
@@ -229,10 +304,10 @@ q
|
|
229 |
Q
|
230 |
Q
|
231 |
q
|
232 |
-
1 0 0 1 123.4724
|
233 |
Q
|
234 |
q
|
235 |
-
1 0 0 1 123.4724
|
236 |
0 0 0 rg
|
237 |
BT /F1 10 Tf 12 TL ET
|
238 |
q
|
@@ -253,10 +328,10 @@ q
|
|
253 |
Q
|
254 |
Q
|
255 |
q
|
256 |
-
1 0 0 1 123.4724
|
257 |
Q
|
258 |
q
|
259 |
-
1 0 0 1 123.4724
|
260 |
0 0 0 rg
|
261 |
BT /F1 10 Tf 12 TL ET
|
262 |
q
|
@@ -277,23 +352,23 @@ q
|
|
277 |
Q
|
278 |
Q
|
279 |
q
|
280 |
-
1 0 0 1 123.4724
|
281 |
Q
|
282 |
q
|
283 |
-
1 0 0 1 123.4724
|
284 |
q
|
285 |
0 0 0 rg
|
286 |
BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Improvements:) Tj T* ET
|
287 |
Q
|
288 |
Q
|
289 |
q
|
290 |
-
1 0 0 1 123.4724
|
291 |
Q
|
292 |
q
|
293 |
-
1 0 0 1 123.4724
|
294 |
Q
|
295 |
q
|
296 |
-
1 0 0 1 123.4724
|
297 |
0 0 0 rg
|
298 |
BT /F1 10 Tf 12 TL ET
|
299 |
q
|
@@ -314,10 +389,10 @@ q
|
|
314 |
Q
|
315 |
Q
|
316 |
q
|
317 |
-
1 0 0 1 123.4724
|
318 |
Q
|
319 |
q
|
320 |
-
1 0 0 1 123.4724
|
321 |
0 0 0 rg
|
322 |
BT /F1 10 Tf 12 TL ET
|
323 |
q
|
@@ -338,37 +413,37 @@ q
|
|
338 |
Q
|
339 |
Q
|
340 |
q
|
341 |
-
1 0 0 1 123.4724
|
342 |
Q
|
343 |
q
|
344 |
-
1 0 0 1 6
|
345 |
q
|
346 |
0 0 0 rg
|
347 |
BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (14.03.31) Tj T* ET
|
348 |
Q
|
349 |
Q
|
350 |
q
|
351 |
-
1 0 0 1 64.73622
|
352 |
q
|
353 |
0 0 0 rg
|
354 |
BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (2014-03-31) Tj T* ET
|
355 |
Q
|
356 |
Q
|
357 |
q
|
358 |
-
1 0 0 1 123.4724
|
359 |
q
|
360 |
0 0 0 rg
|
361 |
BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Features:) Tj T* ET
|
362 |
Q
|
363 |
Q
|
364 |
q
|
365 |
-
1 0 0 1 123.4724
|
366 |
Q
|
367 |
q
|
368 |
-
1 0 0 1 123.4724
|
369 |
Q
|
370 |
q
|
371 |
-
1 0 0 1 123.4724
|
372 |
0 0 0 rg
|
373 |
BT /F1 10 Tf 12 TL ET
|
374 |
q
|
@@ -389,37 +464,37 @@ q
|
|
389 |
Q
|
390 |
Q
|
391 |
q
|
392 |
-
1 0 0 1 123.4724
|
393 |
Q
|
394 |
q
|
395 |
-
1 0 0 1 6
|
396 |
q
|
397 |
0 0 0 rg
|
398 |
BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (14.03.27) Tj T* ET
|
399 |
Q
|
400 |
Q
|
401 |
q
|
402 |
-
1 0 0 1 64.73622
|
403 |
q
|
404 |
0 0 0 rg
|
405 |
BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (2014-03-27) Tj T* ET
|
406 |
Q
|
407 |
Q
|
408 |
q
|
409 |
-
1 0 0 1 123.4724
|
410 |
q
|
411 |
0 0 0 rg
|
412 |
BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Features:) Tj T* ET
|
413 |
Q
|
414 |
Q
|
415 |
q
|
416 |
-
1 0 0 1 123.4724
|
417 |
Q
|
418 |
q
|
419 |
-
1 0 0 1 123.4724
|
420 |
Q
|
421 |
q
|
422 |
-
1 0 0 1 123.4724
|
423 |
0 0 0 rg
|
424 |
BT /F1 10 Tf 12 TL ET
|
425 |
q
|
@@ -440,10 +515,10 @@ q
|
|
440 |
Q
|
441 |
Q
|
442 |
q
|
443 |
-
1 0 0 1 123.4724
|
444 |
Q
|
445 |
q
|
446 |
-
1 0 0 1 123.4724
|
447 |
0 0 0 rg
|
448 |
BT /F1 10 Tf 12 TL ET
|
449 |
q
|
@@ -464,23 +539,23 @@ q
|
|
464 |
Q
|
465 |
Q
|
466 |
q
|
467 |
-
1 0 0 1 123.4724
|
468 |
Q
|
469 |
q
|
470 |
-
1 0 0 1 123.4724
|
471 |
q
|
472 |
0 0 0 rg
|
473 |
BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Improvements:) Tj T* ET
|
474 |
Q
|
475 |
Q
|
476 |
q
|
477 |
-
1 0 0 1 123.4724
|
478 |
Q
|
479 |
q
|
480 |
-
1 0 0 1 123.4724
|
481 |
Q
|
482 |
q
|
483 |
-
1 0 0 1 123.4724
|
484 |
0 0 0 rg
|
485 |
BT /F1 10 Tf 12 TL ET
|
486 |
q
|
@@ -501,10 +576,10 @@ q
|
|
501 |
Q
|
502 |
Q
|
503 |
q
|
504 |
-
1 0 0 1 123.4724
|
505 |
Q
|
506 |
q
|
507 |
-
1 0 0 1 123.4724
|
508 |
0 0 0 rg
|
509 |
BT /F1 10 Tf 12 TL ET
|
510 |
q
|
@@ -525,10 +600,10 @@ q
|
|
525 |
Q
|
526 |
Q
|
527 |
q
|
528 |
-
1 0 0 1 123.4724
|
529 |
Q
|
530 |
q
|
531 |
-
1 0 0 1 123.4724
|
532 |
0 0 0 rg
|
533 |
BT /F1 10 Tf 12 TL ET
|
534 |
q
|
@@ -549,37 +624,37 @@ q
|
|
549 |
Q
|
550 |
Q
|
551 |
q
|
552 |
-
1 0 0 1 123.4724
|
553 |
Q
|
554 |
q
|
555 |
-
1 0 0 1 6
|
556 |
q
|
557 |
0 0 0 rg
|
558 |
BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (13.12.13) Tj T* ET
|
559 |
Q
|
560 |
Q
|
561 |
q
|
562 |
-
1 0 0 1 64.73622
|
563 |
q
|
564 |
0 0 0 rg
|
565 |
BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (2013-12-13) Tj T* ET
|
566 |
Q
|
567 |
Q
|
568 |
q
|
569 |
-
1 0 0 1 123.4724
|
570 |
q
|
571 |
0 0 0 rg
|
572 |
BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Features:) Tj T* ET
|
573 |
Q
|
574 |
Q
|
575 |
q
|
576 |
-
1 0 0 1 123.4724
|
577 |
Q
|
578 |
q
|
579 |
-
1 0 0 1 123.4724
|
580 |
Q
|
581 |
q
|
582 |
-
1 0 0 1 123.4724
|
583 |
0 0 0 rg
|
584 |
BT /F1 10 Tf 12 TL ET
|
585 |
q
|
@@ -600,10 +675,10 @@ q
|
|
600 |
Q
|
601 |
Q
|
602 |
q
|
603 |
-
1 0 0 1 123.4724
|
604 |
Q
|
605 |
q
|
606 |
-
1 0 0 1 123.4724
|
607 |
0 0 0 rg
|
608 |
BT /F1 10 Tf 12 TL ET
|
609 |
q
|
@@ -624,10 +699,10 @@ q
|
|
624 |
Q
|
625 |
Q
|
626 |
q
|
627 |
-
1 0 0 1 123.4724
|
628 |
Q
|
629 |
q
|
630 |
-
1 0 0 1 123.4724
|
631 |
0 0 0 rg
|
632 |
BT /F1 10 Tf 12 TL ET
|
633 |
q
|
@@ -648,23 +723,23 @@ q
|
|
648 |
Q
|
649 |
Q
|
650 |
q
|
651 |
-
1 0 0 1 123.4724
|
652 |
Q
|
653 |
q
|
654 |
-
1 0 0 1 123.4724
|
655 |
q
|
656 |
0 0 0 rg
|
657 |
BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Other:) Tj T* ET
|
658 |
Q
|
659 |
Q
|
660 |
q
|
661 |
-
1 0 0 1 123.4724
|
662 |
Q
|
663 |
q
|
664 |
-
1 0 0 1 123.4724
|
665 |
Q
|
666 |
q
|
667 |
-
1 0 0 1 123.4724
|
668 |
0 0 0 rg
|
669 |
BT /F1 10 Tf 12 TL ET
|
670 |
q
|
@@ -685,10 +760,10 @@ q
|
|
685 |
Q
|
686 |
Q
|
687 |
q
|
688 |
-
1 0 0 1 123.4724
|
689 |
Q
|
690 |
q
|
691 |
-
1 0 0 1 123.4724
|
692 |
0 0 0 rg
|
693 |
BT /F1 10 Tf 12 TL ET
|
694 |
q
|
@@ -709,61 +784,102 @@ q
|
|
709 |
Q
|
710 |
Q
|
711 |
q
|
712 |
-
1 0 0 1 123.4724
|
713 |
Q
|
714 |
q
|
715 |
-
1
|
716 |
-
|
717 |
-
0 0 0
|
718 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
719 |
Q
|
720 |
Q
|
721 |
q
|
722 |
-
1 0 0 1
|
723 |
q
|
|
|
|
|
|
|
|
|
|
|
|
|
724 |
0 0 0 rg
|
725 |
-
BT
|
|
|
|
|
|
|
|
|
726 |
Q
|
727 |
Q
|
728 |
q
|
729 |
-
1 0 0 1
|
730 |
q
|
731 |
0 0 0 rg
|
732 |
-
BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (
|
733 |
Q
|
734 |
Q
|
735 |
q
|
736 |
-
1 0 0 1 123.4724 33 cm
|
737 |
Q
|
738 |
-
q
|
739 |
-
1 0 0 1 123.4724 33 cm
|
740 |
Q
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
741 |
q
|
742 |
-
1 0 0 1
|
|
|
|
|
|
|
|
|
|
|
|
|
743 |
0 0 0 rg
|
744 |
BT /F1 10 Tf 12 TL ET
|
745 |
q
|
746 |
-
1 0 0 1 6
|
747 |
q
|
748 |
0 0 0 rg
|
749 |
-
BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL
|
750 |
Q
|
751 |
Q
|
752 |
q
|
753 |
-
1 0 0 1
|
754 |
q
|
755 |
0 0 0 rg
|
756 |
-
BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (
|
757 |
Q
|
758 |
Q
|
759 |
q
|
|
|
|
|
|
|
|
|
760 |
Q
|
761 |
Q
|
762 |
q
|
763 |
-
1 0 0 1 123.4724
|
764 |
Q
|
765 |
q
|
766 |
-
1 0 0 1 123.4724
|
|
|
|
|
|
|
767 |
0 0 0 rg
|
768 |
BT /F1 10 Tf 12 TL ET
|
769 |
q
|
@@ -777,78 +893,39 @@ q
|
|
777 |
1 0 0 1 23 -3 cm
|
778 |
q
|
779 |
0 0 0 rg
|
780 |
-
BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (
|
781 |
-
Q
|
782 |
-
Q
|
783 |
-
q
|
784 |
-
Q
|
785 |
Q
|
786 |
-
q
|
787 |
-
1 0 0 1 123.4724 3 cm
|
788 |
Q
|
789 |
q
|
790 |
-
1 J
|
791 |
-
1 j
|
792 |
-
0 0 0 RG
|
793 |
-
.25 w
|
794 |
-
n 0 0 m 469.8898 0 l S
|
795 |
-
n 0 498 m 469.8898 498 l S
|
796 |
-
n 0 354 m 469.8898 354 l S
|
797 |
-
n 0 318 m 469.8898 318 l S
|
798 |
-
n 0 174 m 469.8898 174 l S
|
799 |
-
n 0 54 m 469.8898 54 l S
|
800 |
-
n 58.73622 0 m 58.73622 516 l S
|
801 |
-
n 117.4724 0 m 117.4724 516 l S
|
802 |
-
n 0 516 m 469.8898 516 l S
|
803 |
-
n 0 0 m 0 516 l S
|
804 |
-
n 469.8898 0 m 469.8898 516 l S
|
805 |
Q
|
806 |
Q
|
807 |
q
|
808 |
-
1 0 0 1
|
809 |
-
q
|
810 |
-
112.2405 0 0 56.69291 0 0 cm
|
811 |
-
/FormXob.18bc7d0fa4f3fb8d73595ba746f125e6 Do
|
812 |
-
Q
|
813 |
Q
|
814 |
q
|
815 |
-
1 0 0 1
|
816 |
0 0 0 rg
|
817 |
BT /F1 10 Tf 12 TL ET
|
818 |
q
|
819 |
-
1 0 0 1 6 3 cm
|
820 |
q
|
821 |
-
|
|
|
822 |
Q
|
823 |
Q
|
824 |
q
|
825 |
-
1 0 0 1
|
826 |
q
|
827 |
0 0 0 rg
|
828 |
-
BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL
|
829 |
Q
|
830 |
Q
|
831 |
q
|
832 |
Q
|
833 |
Q
|
834 |
-
|
835 |
-
endstream
|
836 |
-
|
837 |
-
endobj
|
838 |
-
% 'R11': class PDFStream
|
839 |
-
11 0 obj
|
840 |
-
% page stream
|
841 |
-
<< /Length 2647 >>
|
842 |
-
stream
|
843 |
-
1 0 0 1 0 0 cm BT /F1 12 Tf 14.4 TL ET
|
844 |
q
|
845 |
-
1 0 0 1
|
846 |
-
|
847 |
-
n 0 90 469.8898 -54 re f*
|
848 |
-
.878431 .878431 .878431 rg
|
849 |
-
n 0 36 469.8898 -36 re f*
|
850 |
-
0 0 0 rg
|
851 |
-
BT /F1 10 Tf 12 TL ET
|
852 |
q
|
853 |
1 0 0 1 6 75 cm
|
854 |
q
|
@@ -980,20 +1057,21 @@ q
|
|
980 |
1 j
|
981 |
0 0 0 RG
|
982 |
.25 w
|
|
|
983 |
n 0 90 m 469.8898 90 l S
|
984 |
n 0 36 m 469.8898 36 l S
|
985 |
-
n 58.73622 0 m 58.73622
|
986 |
-
n 117.4724 0 m 117.4724
|
987 |
-
n 0 0 m 0
|
988 |
-
n 469.8898 0 m 469.8898
|
989 |
n 0 0 m 469.8898 0 l S
|
990 |
Q
|
991 |
Q
|
992 |
q
|
993 |
-
1 0 0 1 62.69291
|
994 |
Q
|
995 |
q
|
996 |
-
1 0 0 1 62.69291
|
997 |
Q
|
998 |
q
|
999 |
1 0 0 1 426.3422 728.5039 cm
|
@@ -1064,19 +1142,19 @@ xref
|
|
1064 |
0000018391 00000 n
|
1065 |
0000018624 00000 n
|
1066 |
0000018738 00000 n
|
1067 |
-
|
1068 |
-
|
1069 |
-
|
1070 |
-
|
1071 |
-
|
1072 |
trailer
|
1073 |
<< /ID
|
1074 |
% ReportLab generated PDF document -- digest (http://www.reportlab.com)
|
1075 |
-
[(
|
1076 |
|
1077 |
/Info 8 0 R
|
1078 |
/Root 7 0 R
|
1079 |
/Size 16 >>
|
1080 |
startxref
|
1081 |
-
|
1082 |
%%EOF
|
91 |
% 'R8': class PDFInfo
|
92 |
8 0 obj
|
93 |
<< /Author ()
|
94 |
+
/CreationDate (D:20140915152116-01'00')
|
95 |
/Keywords ()
|
96 |
/Producer (ReportLab http://www.reportlab.com)
|
97 |
/Subject (\(unspecified\))
|
108 |
% 'R10': class PDFStream
|
109 |
10 0 obj
|
110 |
% page stream
|
111 |
+
<< /Length 11138 >>
|
112 |
stream
|
113 |
1 0 0 1 0 0 cm BT /F1 12 Tf 14.4 TL ET
|
114 |
q
|
129 |
1 0 0 1 62.69291 638.3307 cm
|
130 |
Q
|
131 |
q
|
132 |
+
1 0 0 1 62.69291 110.3307 cm
|
133 |
1 1 1 rg
|
134 |
+
n 0 528 469.8898 -18 re f*
|
135 |
.878431 .878431 .878431 rg
|
136 |
+
n 0 510 469.8898 -66 re f*
|
137 |
1 1 1 rg
|
138 |
+
n 0 444 469.8898 -144 re f*
|
139 |
.878431 .878431 .878431 rg
|
140 |
+
n 0 300 469.8898 -36 re f*
|
141 |
1 1 1 rg
|
142 |
+
n 0 264 469.8898 -144 re f*
|
143 |
.878431 .878431 .878431 rg
|
144 |
+
n 0 120 469.8898 -120 re f*
|
145 |
.960784 .960784 .862745 rg
|
146 |
+
n 0 528 469.8898 -18 re f*
|
147 |
0 .533333 .603922 rg
|
148 |
BT /F1 10 Tf 12 TL ET
|
149 |
q
|
150 |
+
1 0 0 1 6 513 cm
|
151 |
q
|
152 |
.960784 .960784 .862745 rg
|
153 |
n 0 0 46.73622 12 re f*
|
158 |
Q
|
159 |
Q
|
160 |
q
|
161 |
+
1 0 0 1 64.73622 513 cm
|
162 |
q
|
163 |
.960784 .960784 .862745 rg
|
164 |
n 0 0 46.73622 12 re f*
|
169 |
Q
|
170 |
Q
|
171 |
q
|
172 |
+
1 0 0 1 123.4724 513 cm
|
173 |
q
|
174 |
.960784 .960784 .862745 rg
|
175 |
n 0 0 340.4173 12 re f*
|
181 |
Q
|
182 |
0 0 0 rg
|
183 |
q
|
184 |
+
1 0 0 1 6 495 cm
|
185 |
+
q
|
186 |
+
0 0 0 rg
|
187 |
+
BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (14.09.15) Tj T* ET
|
188 |
+
Q
|
189 |
+
Q
|
190 |
+
q
|
191 |
+
1 0 0 1 64.73622 495 cm
|
192 |
+
q
|
193 |
+
0 0 0 rg
|
194 |
+
BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (2014-09-15) Tj T* ET
|
195 |
+
Q
|
196 |
+
Q
|
197 |
+
q
|
198 |
+
1 0 0 1 123.4724 495 cm
|
199 |
+
q
|
200 |
+
0 0 0 rg
|
201 |
+
BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Improvements:) Tj T* ET
|
202 |
+
Q
|
203 |
+
Q
|
204 |
+
q
|
205 |
+
1 0 0 1 123.4724 489 cm
|
206 |
+
Q
|
207 |
+
q
|
208 |
+
1 0 0 1 123.4724 489 cm
|
209 |
+
Q
|
210 |
+
q
|
211 |
+
1 0 0 1 123.4724 477 cm
|
212 |
+
0 0 0 rg
|
213 |
+
BT /F1 10 Tf 12 TL ET
|
214 |
+
q
|
215 |
+
1 0 0 1 6 -3 cm
|
216 |
+
q
|
217 |
+
0 0 0 rg
|
218 |
+
BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 10.5 0 Td (\177) Tj T* -10.5 0 Td ET
|
219 |
+
Q
|
220 |
+
Q
|
221 |
+
q
|
222 |
+
1 0 0 1 23 -3 cm
|
223 |
+
q
|
224 |
+
0 0 0 rg
|
225 |
+
BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Cancel Payment Review Orders in CE 1.7) Tj T* ET
|
226 |
+
Q
|
227 |
+
Q
|
228 |
+
q
|
229 |
+
Q
|
230 |
+
Q
|
231 |
+
q
|
232 |
+
1 0 0 1 123.4724 471 cm
|
233 |
+
Q
|
234 |
+
q
|
235 |
+
1 0 0 1 123.4724 447 cm
|
236 |
+
0 0 0 rg
|
237 |
+
BT /F1 10 Tf 12 TL ET
|
238 |
+
q
|
239 |
+
1 0 0 1 6 9 cm
|
240 |
+
q
|
241 |
+
0 0 0 rg
|
242 |
+
BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 10.5 0 Td (\177) Tj T* -10.5 0 Td ET
|
243 |
+
Q
|
244 |
+
Q
|
245 |
+
q
|
246 |
+
1 0 0 1 23 -3 cm
|
247 |
+
q
|
248 |
+
0 0 0 rg
|
249 |
+
BT 1 0 0 1 0 16.82 Tm /F1 10 Tf 12 TL .074665 Tw (Store configuration max amounts when no handling charges agreement) Tj T* 0 Tw (exists) Tj T* ET
|
250 |
+
Q
|
251 |
+
Q
|
252 |
+
q
|
253 |
+
Q
|
254 |
+
Q
|
255 |
+
q
|
256 |
+
1 0 0 1 123.4724 447 cm
|
257 |
+
Q
|
258 |
+
q
|
259 |
+
1 0 0 1 6 429 cm
|
260 |
q
|
261 |
0 0 0 rg
|
262 |
BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (14.04.24) Tj T* ET
|
263 |
Q
|
264 |
Q
|
265 |
q
|
266 |
+
1 0 0 1 64.73622 429 cm
|
267 |
q
|
268 |
0 0 0 rg
|
269 |
BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (2014-04-24) Tj T* ET
|
270 |
Q
|
271 |
Q
|
272 |
q
|
273 |
+
1 0 0 1 123.4724 429 cm
|
274 |
q
|
275 |
0 0 0 rg
|
276 |
BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Features:) Tj T* ET
|
277 |
Q
|
278 |
Q
|
279 |
q
|
280 |
+
1 0 0 1 123.4724 423 cm
|
281 |
Q
|
282 |
q
|
283 |
+
1 0 0 1 123.4724 423 cm
|
284 |
Q
|
285 |
q
|
286 |
+
1 0 0 1 123.4724 411 cm
|
287 |
0 0 0 rg
|
288 |
BT /F1 10 Tf 12 TL ET
|
289 |
q
|
304 |
Q
|
305 |
Q
|
306 |
q
|
307 |
+
1 0 0 1 123.4724 405 cm
|
308 |
Q
|
309 |
q
|
310 |
+
1 0 0 1 123.4724 393 cm
|
311 |
0 0 0 rg
|
312 |
BT /F1 10 Tf 12 TL ET
|
313 |
q
|
328 |
Q
|
329 |
Q
|
330 |
q
|
331 |
+
1 0 0 1 123.4724 387 cm
|
332 |
Q
|
333 |
q
|
334 |
+
1 0 0 1 123.4724 375 cm
|
335 |
0 0 0 rg
|
336 |
BT /F1 10 Tf 12 TL ET
|
337 |
q
|
352 |
Q
|
353 |
Q
|
354 |
q
|
355 |
+
1 0 0 1 123.4724 375 cm
|
356 |
Q
|
357 |
q
|
358 |
+
1 0 0 1 123.4724 363 cm
|
359 |
q
|
360 |
0 0 0 rg
|
361 |
BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Improvements:) Tj T* ET
|
362 |
Q
|
363 |
Q
|
364 |
q
|
365 |
+
1 0 0 1 123.4724 357 cm
|
366 |
Q
|
367 |
q
|
368 |
+
1 0 0 1 123.4724 357 cm
|
369 |
Q
|
370 |
q
|
371 |
+
1 0 0 1 123.4724 333 cm
|
372 |
0 0 0 rg
|
373 |
BT /F1 10 Tf 12 TL ET
|
374 |
q
|
389 |
Q
|
390 |
Q
|
391 |
q
|
392 |
+
1 0 0 1 123.4724 327 cm
|
393 |
Q
|
394 |
q
|
395 |
+
1 0 0 1 123.4724 303 cm
|
396 |
0 0 0 rg
|
397 |
BT /F1 10 Tf 12 TL ET
|
398 |
q
|
413 |
Q
|
414 |
Q
|
415 |
q
|
416 |
+
1 0 0 1 123.4724 303 cm
|
417 |
Q
|
418 |
q
|
419 |
+
1 0 0 1 6 285 cm
|
420 |
q
|
421 |
0 0 0 rg
|
422 |
BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (14.03.31) Tj T* ET
|
423 |
Q
|
424 |
Q
|
425 |
q
|
426 |
+
1 0 0 1 64.73622 285 cm
|
427 |
q
|
428 |
0 0 0 rg
|
429 |
BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (2014-03-31) Tj T* ET
|
430 |
Q
|
431 |
Q
|
432 |
q
|
433 |
+
1 0 0 1 123.4724 285 cm
|
434 |
q
|
435 |
0 0 0 rg
|
436 |
BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Features:) Tj T* ET
|
437 |
Q
|
438 |
Q
|
439 |
q
|
440 |
+
1 0 0 1 123.4724 279 cm
|
441 |
Q
|
442 |
q
|
443 |
+
1 0 0 1 123.4724 279 cm
|
444 |
Q
|
445 |
q
|
446 |
+
1 0 0 1 123.4724 267 cm
|
447 |
0 0 0 rg
|
448 |
BT /F1 10 Tf 12 TL ET
|
449 |
q
|
464 |
Q
|
465 |
Q
|
466 |
q
|
467 |
+
1 0 0 1 123.4724 267 cm
|
468 |
Q
|
469 |
q
|
470 |
+
1 0 0 1 6 249 cm
|
471 |
q
|
472 |
0 0 0 rg
|
473 |
BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (14.03.27) Tj T* ET
|
474 |
Q
|
475 |
Q
|
476 |
q
|
477 |
+
1 0 0 1 64.73622 249 cm
|
478 |
q
|
479 |
0 0 0 rg
|
480 |
BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (2014-03-27) Tj T* ET
|
481 |
Q
|
482 |
Q
|
483 |
q
|
484 |
+
1 0 0 1 123.4724 249 cm
|
485 |
q
|
486 |
0 0 0 rg
|
487 |
BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Features:) Tj T* ET
|
488 |
Q
|
489 |
Q
|
490 |
q
|
491 |
+
1 0 0 1 123.4724 243 cm
|
492 |
Q
|
493 |
q
|
494 |
+
1 0 0 1 123.4724 243 cm
|
495 |
Q
|
496 |
q
|
497 |
+
1 0 0 1 123.4724 231 cm
|
498 |
0 0 0 rg
|
499 |
BT /F1 10 Tf 12 TL ET
|
500 |
q
|
515 |
Q
|
516 |
Q
|
517 |
q
|
518 |
+
1 0 0 1 123.4724 225 cm
|
519 |
Q
|
520 |
q
|
521 |
+
1 0 0 1 123.4724 201 cm
|
522 |
0 0 0 rg
|
523 |
BT /F1 10 Tf 12 TL ET
|
524 |
q
|
539 |
Q
|
540 |
Q
|
541 |
q
|
542 |
+
1 0 0 1 123.4724 201 cm
|
543 |
Q
|
544 |
q
|
545 |
+
1 0 0 1 123.4724 189 cm
|
546 |
q
|
547 |
0 0 0 rg
|
548 |
BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Improvements:) Tj T* ET
|
549 |
Q
|
550 |
Q
|
551 |
q
|
552 |
+
1 0 0 1 123.4724 183 cm
|
553 |
Q
|
554 |
q
|
555 |
+
1 0 0 1 123.4724 183 cm
|
556 |
Q
|
557 |
q
|
558 |
+
1 0 0 1 123.4724 159 cm
|
559 |
0 0 0 rg
|
560 |
BT /F1 10 Tf 12 TL ET
|
561 |
q
|
576 |
Q
|
577 |
Q
|
578 |
q
|
579 |
+
1 0 0 1 123.4724 153 cm
|
580 |
Q
|
581 |
q
|
582 |
+
1 0 0 1 123.4724 141 cm
|
583 |
0 0 0 rg
|
584 |
BT /F1 10 Tf 12 TL ET
|
585 |
q
|
600 |
Q
|
601 |
Q
|
602 |
q
|
603 |
+
1 0 0 1 123.4724 135 cm
|
604 |
Q
|
605 |
q
|
606 |
+
1 0 0 1 123.4724 123 cm
|
607 |
0 0 0 rg
|
608 |
BT /F1 10 Tf 12 TL ET
|
609 |
q
|
624 |
Q
|
625 |
Q
|
626 |
q
|
627 |
+
1 0 0 1 123.4724 123 cm
|
628 |
Q
|
629 |
q
|
630 |
+
1 0 0 1 6 105 cm
|
631 |
q
|
632 |
0 0 0 rg
|
633 |
BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (13.12.13) Tj T* ET
|
634 |
Q
|
635 |
Q
|
636 |
q
|
637 |
+
1 0 0 1 64.73622 105 cm
|
638 |
q
|
639 |
0 0 0 rg
|
640 |
BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (2013-12-13) Tj T* ET
|
641 |
Q
|
642 |
Q
|
643 |
q
|
644 |
+
1 0 0 1 123.4724 105 cm
|
645 |
q
|
646 |
0 0 0 rg
|
647 |
BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Features:) Tj T* ET
|
648 |
Q
|
649 |
Q
|
650 |
q
|
651 |
+
1 0 0 1 123.4724 99 cm
|
652 |
Q
|
653 |
q
|
654 |
+
1 0 0 1 123.4724 99 cm
|
655 |
Q
|
656 |
q
|
657 |
+
1 0 0 1 123.4724 87 cm
|
658 |
0 0 0 rg
|
659 |
BT /F1 10 Tf 12 TL ET
|
660 |
q
|
675 |
Q
|
676 |
Q
|
677 |
q
|
678 |
+
1 0 0 1 123.4724 81 cm
|
679 |
Q
|
680 |
q
|
681 |
+
1 0 0 1 123.4724 69 cm
|
682 |
0 0 0 rg
|
683 |
BT /F1 10 Tf 12 TL ET
|
684 |
q
|
699 |
Q
|
700 |
Q
|
701 |
q
|
702 |
+
1 0 0 1 123.4724 63 cm
|
703 |
Q
|
704 |
q
|
705 |
+
1 0 0 1 123.4724 51 cm
|
706 |
0 0 0 rg
|
707 |
BT /F1 10 Tf 12 TL ET
|
708 |
q
|
723 |
Q
|
724 |
Q
|
725 |
q
|
726 |
+
1 0 0 1 123.4724 51 cm
|
727 |
Q
|
728 |
q
|
729 |
+
1 0 0 1 123.4724 39 cm
|
730 |
q
|
731 |
0 0 0 rg
|
732 |
BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Other:) Tj T* ET
|
733 |
Q
|
734 |
Q
|
735 |
q
|
736 |
+
1 0 0 1 123.4724 33 cm
|
737 |
Q
|
738 |
q
|
739 |
+
1 0 0 1 123.4724 33 cm
|
740 |
Q
|
741 |
q
|
742 |
+
1 0 0 1 123.4724 21 cm
|
743 |
0 0 0 rg
|
744 |
BT /F1 10 Tf 12 TL ET
|
745 |
q
|
760 |
Q
|
761 |
Q
|
762 |
q
|
763 |
+
1 0 0 1 123.4724 15 cm
|
764 |
Q
|
765 |
q
|
766 |
+
1 0 0 1 123.4724 3 cm
|
767 |
0 0 0 rg
|
768 |
BT /F1 10 Tf 12 TL ET
|
769 |
q
|
784 |
Q
|
785 |
Q
|
786 |
q
|
787 |
+
1 0 0 1 123.4724 3 cm
|
788 |
Q
|
789 |
q
|
790 |
+
1 J
|
791 |
+
1 j
|
792 |
+
0 0 0 RG
|
793 |
+
.25 w
|
794 |
+
n 0 0 m 469.8898 0 l S
|
795 |
+
n 0 510 m 469.8898 510 l S
|
796 |
+
n 0 444 m 469.8898 444 l S
|
797 |
+
n 0 300 m 469.8898 300 l S
|
798 |
+
n 0 264 m 469.8898 264 l S
|
799 |
+
n 0 120 m 469.8898 120 l S
|
800 |
+
n 58.73622 0 m 58.73622 528 l S
|
801 |
+
n 117.4724 0 m 117.4724 528 l S
|
802 |
+
n 0 528 m 469.8898 528 l S
|
803 |
+
n 0 0 m 0 528 l S
|
804 |
+
n 469.8898 0 m 469.8898 528 l S
|
805 |
Q
|
806 |
Q
|
807 |
q
|
808 |
+
1 0 0 1 426.3422 728.5039 cm
|
809 |
q
|
810 |
+
112.2405 0 0 56.69291 0 0 cm
|
811 |
+
/FormXob.18bc7d0fa4f3fb8d73595ba746f125e6 Do
|
812 |
+
Q
|
813 |
+
Q
|
814 |
+
q
|
815 |
+
1 0 0 1 56.69291 56.69291 cm
|
816 |
0 0 0 rg
|
817 |
+
BT /F1 10 Tf 12 TL ET
|
818 |
+
q
|
819 |
+
1 0 0 1 6 3 cm
|
820 |
+
q
|
821 |
+
BT 1 0 0 1 0 4.82 Tm 12 TL /F1 10 Tf 0 0 0 rg (Stand: 20.02.2012) Tj T* ET
|
822 |
Q
|
823 |
Q
|
824 |
q
|
825 |
+
1 0 0 1 246.9449 3 cm
|
826 |
q
|
827 |
0 0 0 rg
|
828 |
+
BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 215.0449 0 Td (1/2) Tj T* -215.0449 0 Td ET
|
829 |
Q
|
830 |
Q
|
831 |
q
|
|
|
832 |
Q
|
|
|
|
|
833 |
Q
|
834 |
+
|
835 |
+
endstream
|
836 |
+
|
837 |
+
endobj
|
838 |
+
% 'R11': class PDFStream
|
839 |
+
11 0 obj
|
840 |
+
% page stream
|
841 |
+
<< /Length 3756 >>
|
842 |
+
stream
|
843 |
+
1 0 0 1 0 0 cm BT /F1 12 Tf 14.4 TL ET
|
844 |
q
|
845 |
+
1 0 0 1 62.69291 564.3307 cm
|
846 |
+
1 1 1 rg
|
847 |
+
n 0 144 469.8898 -54 re f*
|
848 |
+
.878431 .878431 .878431 rg
|
849 |
+
n 0 90 469.8898 -54 re f*
|
850 |
+
1 1 1 rg
|
851 |
+
n 0 36 469.8898 -36 re f*
|
852 |
0 0 0 rg
|
853 |
BT /F1 10 Tf 12 TL ET
|
854 |
q
|
855 |
+
1 0 0 1 6 129 cm
|
856 |
q
|
857 |
0 0 0 rg
|
858 |
+
BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (12.08.16) Tj T* ET
|
859 |
Q
|
860 |
Q
|
861 |
q
|
862 |
+
1 0 0 1 64.73622 129 cm
|
863 |
q
|
864 |
0 0 0 rg
|
865 |
+
BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (2012-08-16) Tj T* ET
|
866 |
Q
|
867 |
Q
|
868 |
q
|
869 |
+
1 0 0 1 123.4724 129 cm
|
870 |
+
q
|
871 |
+
0 0 0 rg
|
872 |
+
BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Features:) Tj T* ET
|
873 |
Q
|
874 |
Q
|
875 |
q
|
876 |
+
1 0 0 1 123.4724 123 cm
|
877 |
Q
|
878 |
q
|
879 |
+
1 0 0 1 123.4724 123 cm
|
880 |
+
Q
|
881 |
+
q
|
882 |
+
1 0 0 1 123.4724 111 cm
|
883 |
0 0 0 rg
|
884 |
BT /F1 10 Tf 12 TL ET
|
885 |
q
|
893 |
1 0 0 1 23 -3 cm
|
894 |
q
|
895 |
0 0 0 rg
|
896 |
+
BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Fix partial invoicing with payment fee) Tj T* ET
|
|
|
|
|
|
|
|
|
897 |
Q
|
|
|
|
|
898 |
Q
|
899 |
q
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
900 |
Q
|
901 |
Q
|
902 |
q
|
903 |
+
1 0 0 1 123.4724 105 cm
|
|
|
|
|
|
|
|
|
904 |
Q
|
905 |
q
|
906 |
+
1 0 0 1 123.4724 93 cm
|
907 |
0 0 0 rg
|
908 |
BT /F1 10 Tf 12 TL ET
|
909 |
q
|
910 |
+
1 0 0 1 6 -3 cm
|
911 |
q
|
912 |
+
0 0 0 rg
|
913 |
+
BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 10.5 0 Td (\177) Tj T* -10.5 0 Td ET
|
914 |
Q
|
915 |
Q
|
916 |
q
|
917 |
+
1 0 0 1 23 -3 cm
|
918 |
q
|
919 |
0 0 0 rg
|
920 |
+
BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Update documentation) Tj T* ET
|
921 |
Q
|
922 |
Q
|
923 |
q
|
924 |
Q
|
925 |
Q
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
926 |
q
|
927 |
+
1 0 0 1 123.4724 93 cm
|
928 |
+
Q
|
|
|
|
|
|
|
|
|
|
|
929 |
q
|
930 |
1 0 0 1 6 75 cm
|
931 |
q
|
1057 |
1 j
|
1058 |
0 0 0 RG
|
1059 |
.25 w
|
1060 |
+
n 0 144 m 469.8898 144 l S
|
1061 |
n 0 90 m 469.8898 90 l S
|
1062 |
n 0 36 m 469.8898 36 l S
|
1063 |
+
n 58.73622 0 m 58.73622 144 l S
|
1064 |
+
n 117.4724 0 m 117.4724 144 l S
|
1065 |
+
n 0 0 m 0 144 l S
|
1066 |
+
n 469.8898 0 m 469.8898 144 l S
|
1067 |
n 0 0 m 469.8898 0 l S
|
1068 |
Q
|
1069 |
Q
|
1070 |
q
|
1071 |
+
1 0 0 1 62.69291 564.3307 cm
|
1072 |
Q
|
1073 |
q
|
1074 |
+
1 0 0 1 62.69291 564.3307 cm
|
1075 |
Q
|
1076 |
q
|
1077 |
1 0 0 1 426.3422 728.5039 cm
|
1142 |
0000018391 00000 n
|
1143 |
0000018624 00000 n
|
1144 |
0000018738 00000 n
|
1145 |
+
0000029978 00000 n
|
1146 |
+
0000033837 00000 n
|
1147 |
+
0000033920 00000 n
|
1148 |
+
0000034026 00000 n
|
1149 |
+
0000034103 00000 n
|
1150 |
trailer
|
1151 |
<< /ID
|
1152 |
% ReportLab generated PDF document -- digest (http://www.reportlab.com)
|
1153 |
+
[(\245\201\374\344"@s-\222#\241!\257\256\266\264) (\245\201\374\344"@s-\222#\241!\257\256\266\264)]
|
1154 |
|
1155 |
/Info 8 0 R
|
1156 |
/Root 7 0 R
|
1157 |
/Size 16 >>
|
1158 |
startxref
|
1159 |
+
34150
|
1160 |
%%EOF
|
doc/Netresearch_Billsafe/README.pdf
CHANGED
@@ -1482,7 +1482,7 @@ endobj
|
|
1482 |
% 'R85': class PDFInfo
|
1483 |
85 0 obj
|
1484 |
<< /Author ()
|
1485 |
-
/CreationDate (D:
|
1486 |
/Keywords ()
|
1487 |
/Producer (ReportLab http://www.reportlab.com)
|
1488 |
/Subject (\(unspecified\))
|
@@ -3972,7 +3972,7 @@ xref
|
|
3972 |
trailer
|
3973 |
<< /ID
|
3974 |
% ReportLab generated PDF document -- digest (http://www.reportlab.com)
|
3975 |
-
[(
|
3976 |
|
3977 |
/Info 85 0 R
|
3978 |
/Root 84 0 R
|
1482 |
% 'R85': class PDFInfo
|
1483 |
85 0 obj
|
1484 |
<< /Author ()
|
1485 |
+
/CreationDate (D:20140915152113-01'00')
|
1486 |
/Keywords ()
|
1487 |
/Producer (ReportLab http://www.reportlab.com)
|
1488 |
/Subject (\(unspecified\))
|
3972 |
trailer
|
3973 |
<< /ID
|
3974 |
% ReportLab generated PDF document -- digest (http://www.reportlab.com)
|
3975 |
+
[(H\206/z\302\265\235\254{\334_\363'\007\211+) (H\206/z\302\265\235\254{\334_\363'\007\211+)]
|
3976 |
|
3977 |
/Info 85 0 R
|
3978 |
/Root 84 0 R
|
package.xml
CHANGED
@@ -1,2 +1,2 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
-
<package><name>BillSAFE_3</name><version>14.
|
1 |
<?xml version="1.0"?>
|
2 |
+
<package><name>BillSAFE_3</name><version>14.09.15</version><stability>stable</stability><license>OSL3</license><channel>community</channel><extends></extends><summary>Billsafe Extension</summary><description>Billsafe Extension</description><notes>Stable Release</notes><authors><author><name>Kristian Büsch</name><user>kbuesch</user><email>kbuesch@paypal.com</email></author></authors><date>2014-09-15</date><time>6:21:17</time><compatible></compatible><dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies><contents><target name="mage"><dir name="doc"><dir name="Netresearch_Billsafe"><file name="ChangeLog.pdf" hash="9300f6a0c1152f321be7401f0bc6b0c8"/><file name="README.pdf" hash="3b9e83f32e8ad218323dd62091de3f20"/></dir></dir><dir name="skin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="css"><file name="billsafe.css" hash="7129eaa8338c84c1bf338474d7e3960a"/></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="js"><dir name="netresearch_billsafe"><file name="tools.js" hash="6cb930de689601d7603cc91a81254df2"/></dir></dir></dir></dir></dir></dir><dir name="app"><dir name="locale"><dir name="de_DE"><file name="Netresearch_Billsafe.csv" hash="a83cb634b1d78453bddce3a17cb4ae78"/><file name="Netresearch_PaymentFee.csv" hash="ee08fa2cb6ed0a660db7df18696f5e17"/></dir><dir name="en_US"><file name="Netresearch_PaymentFee.csv" hash="d41d8cd98f00b204e9800998ecf8427e"/></dir></dir><dir name="design"><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="billsafe"><file name="info.phtml" hash="229d7e88ed38ba2a413c9323e12c1aa0"/><dir name="customer"><dir name="widget"><file name="dob.phtml" hash="c394734c5a350a2e47c143f2398935cb"/></dir></dir><dir name="payment"><file name="form.phtml" hash="ca6ec537cfc8c0434341757c9ec286d5"/></dir></dir></dir><dir name="layout"><file name="billsafe.xml" hash="7ba46fd84f8faa378ab61e32dfa9ceac"/></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="billsafe"><file name="info.phtml" hash="8183491543dcffc7f66af9fb06740e80"/><dir name="pdf"><file name="info.phtml" hash="125e58bd1eb021106ad45c0e9b960f01"/><file name="mrg.phtml" hash="68c1f430c50cdb9d413369a7defa6a03"/></dir><dir name="sales"><dir name="order"><dir name="view"><dir name="tab"><file name="billsafe.phtml" hash="ae109285c168cf9e7a9e74f75a6a9f95"/></dir><dir name="pause"><file name="form.phtml" hash="6000a6ae279e518cd0bdfed4ef29caef"/></dir><dir name="payment"><file name="form.phtml" hash="af3ddfe15cedc2bd55d96b4a15adf0ce"/><file name="overview.phtml" hash="d89beb6d5723e7836dcaff003277ff5d"/></dir></dir></dir></dir><dir name="system"><dir name="config"><file name="paymentfeecheck.phtml" hash="cd5cfb1357c3885965dcfaf9b3da4eaa"/></dir></dir></dir></dir><dir name="layout"><file name="billsafe.xml" hash="90385354ea88d4500dc3622f4c7099ea"/></dir></dir></dir></dir></dir><dir name="code"><dir name="community"><dir name="Netresearch"><dir name="PaymentFee"><dir name="Test"><dir name="Model"><file name="ObserverTest.php" hash="32ba1f9b3fb8e8a9372da43f8fc9368e"/></dir><dir name="Config"><file name="ConfigTest.php" hash="cf41bf5d7cb77e4d9a4de4dbb5186512"/></dir></dir><dir name="Helper"><file name="Data.php" hash="41ca5369190288ea1eb14e2a591b6d97"/></dir><dir name="Model"><file name="Observer.php" hash="2e4d2b0faaf6af72e209c7fb40b81b51"/><dir name="System"><dir name="Config"><dir name="Source"><dir name="Payment"><file name="Methods.php" hash="5e49ffdd605a2b9dcc21c351c3afb075"/></dir></dir></dir></dir></dir><dir name="controllers"><dir name="Adminhtml"><file name="FeeController.php" hash="5763a58bfd3f11b3ae41d5949724f0e8"/></dir></dir><dir name="etc"><file name="config.xml" hash="6beccc3c342a85000f0f454fc43b8503"/><file name="system.xml" hash="32ac7aabae936ec08aefb6b112f88b26"/></dir></dir><dir name="Billsafe"><dir name="sql"><dir name="billsafe_setup"><file name="mysql4-install-0.1.0.php" hash="9906e49a293cc8511f2ce53be301b3d3"/><file name="mysql4-upgrade-11.09.14-11.11.07.php" hash="f74406fe3e100c69a020bca556ad1ce3"/><file name="upgrade-14.03.31-14.04.24.php" hash="a45a3180f316b89e087610253bb33f17"/></dir></dir><dir name="Test"><dir name="Controller"><file name="PaymentControllerTest.php" hash="4e1d3d289b0b0a7b341665fc89786ae4"/><dir name="Adminhtml"><file name="ApiControllerTest.php" hash="cb28bbeeae785cb3d75e0269eb3b60a4"/></dir></dir><dir name="Helper"><file name="CustomerTest.php" hash="60cb8197887c5bf362db5ea665ff6604"/><file name="DataTest.php" hash="8f686edf7b28a91e34af8f76d4f18bbe"/><file name="OrderTest.php" hash="d937c5ef5c9aedcf3e860fb4b38abd69"/><dir name="OrderTest"><dir name="fixtures"><file name="orders.yaml" hash="14e05b7bda0018f195e61f8bb596f160"/></dir></dir></dir><dir name="Model"><file name="ClientTest.php" hash="3b07f50da1cb3bc834da87559b0068f8"/><file name="ConfigTest.php" hash="573c49b344797d08a6241d85e2db891a"/><file name="ObserverTest.php" hash="1b31ce8b23861ae063b1f3f9ddf656e3"/><file name="PaymentTest.php" hash="1054a12c8bc977c9ed199f857aedac6b"/><dir name="Direct"><file name="PaymentTest.php" hash="6c20cb26ffbf8becb722e5ec5c0a2120"/></dir><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Source"><file name="GenderTest.php" hash="d197bd797a59d302f5fbc72e250adfa4"/></dir></dir></dir></dir><dir name="ConfigTest"><file name="MaxAmountTest.php" hash="541b765fd57003e331b14b9041561fa3"/><file name="MaxFeeTest.php" hash="d235c1f0e874d5bf02e34ad5fd345271"/></dir></dir><dir name="Block"><file name="InfoTest.php" hash="7d1973a3d3e71f2d543484c8e873f3d8"/><dir name="Adminhtml"><dir name="Sales"><dir name="Order"><dir name="View"><dir name="Tab"><file name="BillsafeTest.php" hash="0044382a97e111021e9f14170563385e"/></dir><dir name="Payment"><file name="FormTest.php" hash="355914243fe0ba3ad215c2ea642b304c"/></dir><dir name="Pause"><file name="FormTest.php" hash="e9591638dca53f732d944c7202f5bb8e"/></dir></dir></dir></dir></dir><dir name="Payment"><file name="FormTest.php" hash="53a4a81423abd719cd1c41203a582f8f"/></dir><dir name="Customer"><dir name="Widget"><file name="DobTest.php" hash="279ab2bebbef665ebb1a44c8ef93327a"/></dir></dir></dir><dir name="var"><dir name="fixtures"><file name="orders.yaml" hash="1834f843a1ffa084adc4c872f48d90f9"/><file name="stores.yaml" hash="21a5d3104574c6f1bf9ff05f74196748"/></dir></dir></dir><dir name="Helper"><file name="Customer.php" hash="f37e82ba46d0bdd0dae0dfefbe44d5f9"/><file name="Data.php" hash="d3285e9bbb1e145a94238f1276d1bf0b"/><file name="Order.php" hash="6dbe6e206924e8a1d3e9e439dddce069"/></dir><dir name="Model"><file name="Client.php" hash="6d7ba386fa59132c6e74f73e7a4f26b3"/><file name="Config.php" hash="40a4fbe7429cddf73be185b07951d014"/><file name="Observer.php" hash="63e43223d65468d0deff0dd2a43ac0ce"/><file name="Payment.php" hash="4f30faad67b9b1b3e9bae92b0b8a8074"/><dir name="Pdf"><dir name="Engine"><dir name="Invoice"><file name="Default.php" hash="463521a517d8cc7ef027d7373c2375cd"/></dir></dir><dir name="Items"><file name="Invoice.php" hash="6bab18e87e6e5571a4fc2ccdbe75e5ee"/><dir name="Invoice"><file name="Info.php" hash="b8d7c058b38ebfd786b570dcd626347c"/></dir></dir></dir><dir name="Client"><file name="Base.php" hash="16fbeffcc20585f6e43fda3b0c083d57"/></dir><dir name="Direct"><file name="Payment.php" hash="8a28e833846425d5f469ef5a05a8d6b8"/></dir><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Source"><file name="Gender.php" hash="df8f8d18e152cce92297c797262b3671"/></dir></dir></dir></dir><dir name="Config"><file name="Abstract.php" hash="b312beda8b54c385a8626e105e5905c1"/><file name="Exception.php" hash="95bec13e847a6d55c378401a74c4ac0a"/><file name="Maxamount.php" hash="ff7b0fa792582143fa137f03f8010449"/><file name="Maxfee.php" hash="d00786a02526dafc0731eff7da87638e"/></dir><dir name="Resource"><dir name="Direct"><file name="Payment.php" hash="57d2f533ca75bd471cf66ab4b65a0dcc"/><dir name="Payment"><file name="Collection.php" hash="dfec3cce0c4dff943e7d5c79d78b8051"/></dir></dir></dir><dir name="Io"><file name="Settlement.php" hash="66d634ce636f12b6e2ab328bcd5a5eb8"/></dir></dir><dir name="controllers"><file name="PaymentController.php" hash="679dcfb519954dadc7df00b825d66de0"/><dir name="Adminhtml"><file name="ApiController.php" hash="3d59a049dc17aa45b1eecf1ae0a55d8e"/></dir></dir><dir name="Block"><file name="Info.php" hash="fcdafba1b69989b09535c9ae414ba180"/><dir name="Adminhtml"><dir name="Sales"><dir name="Order"><file name="Totalbar.php" hash="db5c1edc70c1fe25e3852785c4c3f0b8"/><dir name="View"><dir name="Tab"><file name="Billsafe.php" hash="b0af07aa1177d80b81975e6ca70a1de9"/></dir><dir name="Payment"><file name="Form.php" hash="ec06a2c8d58d2d353776f6dcec042bca"/><file name="Overview.php" hash="ecedd24e6d2b571d891e7d15f3ef3be9"/></dir><dir name="Pause"><file name="Form.php" hash="1da87b75824bcd3822ff32f141754a3a"/></dir></dir></dir></dir><dir name="System"><dir name="Config"><file name="Paymentfeecheck.php" hash="fdace6ddea9c5c2fac8b264df834012e"/></dir></dir></dir><dir name="Payment"><file name="Form.php" hash="408222b6f364337775177d55e9e395d6"/></dir><dir name="Customer"><dir name="Widget"><file name="Dob.php" hash="26a34b88060d80e5b1f1e6412b1eb7d4"/></dir></dir></dir><dir name="data"><dir name="billsafe_setup"><file name="data-upgrade-14.03.31-14.04.03.php" hash="ccad741d9ab4f942a6dda51318f75ce1"/></dir></dir><dir name="etc"><file name="config.xml" hash="d0f13acb4b226fa14febbb2773cc6ef8"/><file name="system.xml" hash="c71210f9426b905d62173e47918340aa"/></dir></dir></dir></dir></dir><dir name="etc"><dir name="modules"><file name="Netresearch_Billsafe.xml" hash="8d4f15dddfcc1034a78b4e9782db7770"/><file name="Netresearch_PaymentFee.xml" hash="66173a1777313e72fbee83b510f9d59d"/></dir></dir></dir></target></contents></package>
|
skin/frontend/base/default/css/billsafe.css
CHANGED
@@ -10,4 +10,5 @@
|
|
10 |
.form-list .billsafe-customer-dob .dob-year { width:140px; }
|
11 |
.form-list .billsafe-customer-dob .dob-year input.input-text { width:134px; }
|
12 |
label[for='payment:month'].required { text-align: left; width: auto; }
|
13 |
-
#label_billsafe_terms_accepted {width: auto; float: none; margin-left: 20px; display: block; text-align: left;}
|
|
10 |
.form-list .billsafe-customer-dob .dob-year { width:140px; }
|
11 |
.form-list .billsafe-customer-dob .dob-year input.input-text { width:134px; }
|
12 |
label[for='payment:month'].required { text-align: left; width: auto; }
|
13 |
+
#label_billsafe_terms_accepted {width: auto; float: none; margin-left: 20px; display: block; text-align: left;}
|
14 |
+
#label_billsafe_terms_accepted a {float: none; margin: 0;}
|