Version Notes
Added some additional user data(Customer IP,Order ID, Magento and Extension version ) to each transaction request XML
Download this release
Release Info
Developer | Brad Seeley |
Extension | planetpay_ipaygateway |
Version | 1.0.8 |
Comparing to | |
See all releases |
Code changes from version 1.0.7 to 1.0.8
- app/code/community/PlanetPayment/IpayGateway/Block/Adminhtml/Payment/_notes/dwsync.xml +4 -0
- app/code/community/PlanetPayment/IpayGateway/Block/Adminhtml/System/Config/_notes/dwsync.xml +6 -0
- app/code/community/PlanetPayment/IpayGateway/Block/Onepage/_notes/dwsync.xml +4 -0
- app/code/community/PlanetPayment/IpayGateway/Block/Profile/_notes/dwsync.xml +5 -0
- app/code/community/PlanetPayment/IpayGateway/Block/Sales/Order/Totals.php +6 -5
- app/code/community/PlanetPayment/IpayGateway/Block/Sales/Order/_notes/dwsync.xml +5 -0
- app/code/community/PlanetPayment/IpayGateway/Model/Ipay.php +4 -0
- app/code/community/PlanetPayment/IpayGateway/Model/Observer/_notes/dwsync.xml +6 -0
- app/code/community/PlanetPayment/IpayGateway/Model/System/Config/Payment/_notes/dwsync.xml +7 -0
- app/code/community/PlanetPayment/IpayGateway/Model/Xml/Request.php +84 -70
- app/code/community/PlanetPayment/IpayGateway/Model/Xml/Response.php +4 -0
- app/code/community/PlanetPayment/IpayGateway/controllers/OnepageController.php +3 -1
- app/code/community/PlanetPayment/IpayGateway/etc/config.xml +20 -0
- app/code/community/PlanetPayment/IpayGateway/sql/ipay_setup/mysql4-upgrade-1.0.0-1.0.1.php +14 -12
- app/code/community/PlanetPayment/IpayGateway/sql/ipay_setup/mysql4-upgrade-1.0.1-1.0.2.php +13 -12
- app/design/frontend/base/default/layout/ipay.xml +8 -0
- app/design/frontend/base/default/template/ipay/email/order/ipay_custom.phtml +41 -0
- app/design/frontend/base/default/template/ipay/sales/order/totals.phtml +85 -0
- app/locale/en_US/template/email/sales/ipay/order_new.html +109 -0
- app/locale/en_US/template/email/sales/ipay/order_new_guest.html +108 -0
- package.xml +9 -8
- skin/frontend/base/default/js/ipay/_notes/dwsync.xml +4 -0
app/code/community/PlanetPayment/IpayGateway/Block/Adminhtml/Payment/_notes/dwsync.xml
ADDED
@@ -0,0 +1,4 @@
|
|
|
|
|
|
|
|
|
1 |
+
<?xml version="1.0" encoding="utf-8" ?>
|
2 |
+
<dwsync>
|
3 |
+
<file name="Form.php" server="foreigncurrencypayments.com" local="130020691460000000" remote="130216222800000000" Dst="0" />
|
4 |
+
</dwsync>
|
app/code/community/PlanetPayment/IpayGateway/Block/Adminhtml/System/Config/_notes/dwsync.xml
ADDED
@@ -0,0 +1,6 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?xml version="1.0" encoding="utf-8" ?>
|
2 |
+
<dwsync>
|
3 |
+
<file name="Export.php" server="foreigncurrencypayments.com" local="130020691460000000" remote="130216223400000000" Dst="0" />
|
4 |
+
<file name="Purge.php" server="foreigncurrencypayments.com" local="130020691460000000" remote="130216223400000000" Dst="0" />
|
5 |
+
<file name="Test.php" server="foreigncurrencypayments.com" local="130020691460000000" remote="130216223400000000" Dst="0" />
|
6 |
+
</dwsync>
|
app/code/community/PlanetPayment/IpayGateway/Block/Onepage/_notes/dwsync.xml
ADDED
@@ -0,0 +1,4 @@
|
|
|
|
|
|
|
|
|
1 |
+
<?xml version="1.0" encoding="utf-8" ?>
|
2 |
+
<dwsync>
|
3 |
+
<file name="Ipay.php" server="foreigncurrencypayments.com" local="130020691460000000" remote="130216223400000000" Dst="0" />
|
4 |
+
</dwsync>
|
app/code/community/PlanetPayment/IpayGateway/Block/Profile/_notes/dwsync.xml
ADDED
@@ -0,0 +1,5 @@
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?xml version="1.0" encoding="utf-8" ?>
|
2 |
+
<dwsync>
|
3 |
+
<file name="Edit.php" server="foreigncurrencypayments.com" local="130020691460000000" remote="130216224000000000" Dst="0" />
|
4 |
+
<file name="List.php" server="foreigncurrencypayments.com" local="130020691460000000" remote="130216224000000000" Dst="0" />
|
5 |
+
</dwsync>
|
app/code/community/PlanetPayment/IpayGateway/Block/Sales/Order/Totals.php
CHANGED
@@ -90,18 +90,19 @@ class PlanetPayment_IpayGateway_Block_Sales_Order_Totals extends Mage_Sales_Bloc
|
|
90 |
if($quote->getId()) {
|
91 |
$exchangeRate = $quote->getIpayExchangeRate();
|
92 |
if ($this->_isPyc() && $exchangeRate) {
|
93 |
-
|
94 |
-
|
|
|
95 |
} elseif ($this->_isMcp()) {
|
96 |
$total = $source->getGrandTotal();
|
97 |
-
|
98 |
} else {
|
99 |
$total = $source->getBaseGrandTotal();
|
100 |
-
|
101 |
}
|
102 |
$this->_totals['base_grandtotal'] = new Varien_Object(array(
|
103 |
'code' => 'base_grandtotal',
|
104 |
-
'value' => $
|
105 |
'label' => $this->__('Grand Total to be Charged'),
|
106 |
'is_formated' => true,
|
107 |
));
|
90 |
if($quote->getId()) {
|
91 |
$exchangeRate = $quote->getIpayExchangeRate();
|
92 |
if ($this->_isPyc() && $exchangeRate) {
|
93 |
+
//$total = $source->getBaseGrandTotal();
|
94 |
+
$total = number_format($source->getBaseGrandTotal() * $exchangeRate, 2);
|
95 |
+
//$currency = Mage::app()->getLocale()->currency($this->getOrder()->getPayment()->getIpayCurrencyCode())->getSymbol() . " " . number_format($total * $exchangeRate, 2);
|
96 |
} elseif ($this->_isMcp()) {
|
97 |
$total = $source->getGrandTotal();
|
98 |
+
//$currency = Mage::app()->getStore()->getCurrentCurrency()->format($total, array(), true);
|
99 |
} else {
|
100 |
$total = $source->getBaseGrandTotal();
|
101 |
+
//$currency = Mage::app()->getStore()->getBaseCurrency()->format($total, array(), true);
|
102 |
}
|
103 |
$this->_totals['base_grandtotal'] = new Varien_Object(array(
|
104 |
'code' => 'base_grandtotal',
|
105 |
+
'value' => $total,
|
106 |
'label' => $this->__('Grand Total to be Charged'),
|
107 |
'is_formated' => true,
|
108 |
));
|
app/code/community/PlanetPayment/IpayGateway/Block/Sales/Order/_notes/dwsync.xml
ADDED
@@ -0,0 +1,5 @@
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?xml version="1.0" encoding="utf-8" ?>
|
2 |
+
<dwsync>
|
3 |
+
<file name="Totals.php" server="www.tshirtpusher.com" local="130207326382330020" remote="130206894000000000" Dst="0" />
|
4 |
+
<file name="Totals.php" server="foreigncurrencypayments.com" local="130207326382330020" remote="130216224000000000" Dst="0" />
|
5 |
+
</dwsync>
|
app/code/community/PlanetPayment/IpayGateway/Model/Ipay.php
CHANGED
@@ -147,6 +147,8 @@ class PlanetPayment_IpayGateway_Model_Ipay extends Mage_Payment_Model_Method_Cc
|
|
147 |
$exchangeRate = $paymentType == self::PAYMENT_SERVICE_PYC ? (1/$result->FIELDS->PYC_EXCHANGE_RATE) : Mage::helper('ipay')->getQuote()->getBaseToQuoteRate();
|
148 |
$payment->setStatus(self::STATUS_APPROVED);
|
149 |
$payment->setIpayExchangeRate($exchangeRate);
|
|
|
|
|
150 |
$payment->setLastTransId($result->FIELDS->TRANSACTION_ID);
|
151 |
if (!$payment->getParentTransactionId() || $result->FIELDS->TRANSACTION_ID != $payment->getParentTransactionId()) {
|
152 |
$payment->setTransactionId($result->FIELDS->TRANSACTION_ID);
|
@@ -196,6 +198,8 @@ class PlanetPayment_IpayGateway_Model_Ipay extends Mage_Payment_Model_Method_Cc
|
|
196 |
->setLastTransId($result->FIELDS->TRANSACTION_ID)
|
197 |
->setTransactionId($result->FIELDS->TRANSACTION_ID)
|
198 |
->setIpayExchangeRate($exchangeRate)
|
|
|
|
|
199 |
->setIsTransactionClosed(0)
|
200 |
->setCcTransId($result->FIELDS->P3DS_TRANSACTION_ID)
|
201 |
->setStatus(self::STATUS_APPROVED);
|
147 |
$exchangeRate = $paymentType == self::PAYMENT_SERVICE_PYC ? (1/$result->FIELDS->PYC_EXCHANGE_RATE) : Mage::helper('ipay')->getQuote()->getBaseToQuoteRate();
|
148 |
$payment->setStatus(self::STATUS_APPROVED);
|
149 |
$payment->setIpayExchangeRate($exchangeRate);
|
150 |
+
$payment->setIpayMarkup($result->FIELDS->PYC_MARKUP);
|
151 |
+
$payment->setIpayServiceUsed(Mage::getStoreConfig('payment/ipay/service'));
|
152 |
$payment->setLastTransId($result->FIELDS->TRANSACTION_ID);
|
153 |
if (!$payment->getParentTransactionId() || $result->FIELDS->TRANSACTION_ID != $payment->getParentTransactionId()) {
|
154 |
$payment->setTransactionId($result->FIELDS->TRANSACTION_ID);
|
198 |
->setLastTransId($result->FIELDS->TRANSACTION_ID)
|
199 |
->setTransactionId($result->FIELDS->TRANSACTION_ID)
|
200 |
->setIpayExchangeRate($exchangeRate)
|
201 |
+
->setIpayMarkup($result->FIELDS->PYC_MARKUP)
|
202 |
+
->setIpayServiceUsed(Mage::getStoreConfig('payment/ipay/service'))
|
203 |
->setIsTransactionClosed(0)
|
204 |
->setCcTransId($result->FIELDS->P3DS_TRANSACTION_ID)
|
205 |
->setStatus(self::STATUS_APPROVED);
|
app/code/community/PlanetPayment/IpayGateway/Model/Observer/_notes/dwsync.xml
ADDED
@@ -0,0 +1,6 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?xml version="1.0" encoding="utf-8" ?>
|
2 |
+
<dwsync>
|
3 |
+
<file name="Abstract.php" server="foreigncurrencypayments.com" local="130020691460000000" remote="130216225200000000" Dst="0" />
|
4 |
+
<file name="Checkout.php" server="foreigncurrencypayments.com" local="130020691460000000" remote="130216225200000000" Dst="0" />
|
5 |
+
<file name="Log.php" server="foreigncurrencypayments.com" local="130020691460000000" remote="130216225200000000" Dst="0" />
|
6 |
+
</dwsync>
|
app/code/community/PlanetPayment/IpayGateway/Model/System/Config/Payment/_notes/dwsync.xml
ADDED
@@ -0,0 +1,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?xml version="1.0" encoding="utf-8" ?>
|
2 |
+
<dwsync>
|
3 |
+
<file name="Cctype.php" server="foreigncurrencypayments.com" local="130020691460000000" remote="130216225800000000" Dst="0" />
|
4 |
+
<file name="Currency.php" server="foreigncurrencypayments.com" local="130020691460000000" remote="130216225800000000" Dst="0" />
|
5 |
+
<file name="PaymentAction.php" server="foreigncurrencypayments.com" local="130020691460000000" remote="130216225800000000" Dst="0" />
|
6 |
+
<file name="Service.php" server="foreigncurrencypayments.com" local="130020691460000000" remote="130216225800000000" Dst="0" />
|
7 |
+
</dwsync>
|
app/code/community/PlanetPayment/IpayGateway/Model/Xml/Request.php
CHANGED
@@ -1,5 +1,4 @@
|
|
1 |
<?php
|
2 |
-
|
3 |
/**
|
4 |
* One Pica
|
5 |
*
|
@@ -112,17 +111,12 @@ class PlanetPayment_IpayGateway_Model_Xml_Request extends PlanetPayment_IpayGate
|
|
112 |
public function generateRequestForPycAuth() {
|
113 |
try {
|
114 |
$payment = $this->getPayment();
|
115 |
-
|
116 |
$profile = $this->_getProfile($payment->getIpayProfileId());
|
117 |
$quote = Mage::helper('ipay')->getQuote();
|
118 |
-
|
119 |
$billingAddress = $quote->getBillingAddress();
|
120 |
-
|
121 |
$hasEncryption = $this->_hasEncryption();
|
122 |
-
|
123 |
$key = $this->_getConfig('key', 'general');
|
124 |
$encryption = $hasEncryption ? '1' : '0';
|
125 |
-
|
126 |
$request = $this->_getRootNode();
|
127 |
$transaction = $request->addChild('TRANSACTION');
|
128 |
$fields = $transaction->addChild('FIELDS');
|
@@ -142,13 +136,14 @@ class PlanetPayment_IpayGateway_Model_Xml_Request extends PlanetPayment_IpayGate
|
|
142 |
$fields->addChild('FIRST_NAME', $billingAddress->getFirstname());
|
143 |
$fields->addChild('LAST_NAME', $billingAddress->getLastname());
|
144 |
$fields->addChild('ADDRESS', $this->_conditionAddress($billingAddress->getStreet(1)));
|
145 |
-
|
146 |
$fields->addChild('CITY', $billingAddress->getCity());
|
147 |
$fields->addChild('POSTAL_CODE', $this->_conditionPostalCode($billingAddress->getPostcode()));
|
148 |
}
|
149 |
|
150 |
$fields->addChild('AMOUNT', $this->getAmount());
|
151 |
$fields->addChild('CURRENCY_CODE', $this->_getCurrencyIsoCode($this->getNativeCurrency()));
|
|
|
152 |
//If a different currecy is selected by the customer
|
153 |
if ($payment->getId() && $payment->getIpayCurrencyCode()) {
|
154 |
if ($payment->getIpayCurrencyCode() == $this->getNativeCurrency()) {
|
@@ -160,13 +155,13 @@ class PlanetPayment_IpayGateway_Model_Xml_Request extends PlanetPayment_IpayGate
|
|
160 |
$fields->addChild('CURRENCY_INDICATOR', '0');
|
161 |
}
|
162 |
$fields->addChild('TRANSACTION_INDICATOR', '7');
|
163 |
-
|
164 |
-
|
165 |
-
|
|
|
|
|
166 |
$this->setTransactionForLog($request);
|
167 |
-
|
168 |
-
|
169 |
-
if ($hasEncryption) {
|
170 |
$this->_encryptRequest($request);
|
171 |
}
|
172 |
$this->setTransaction($request);
|
@@ -176,7 +171,6 @@ class PlanetPayment_IpayGateway_Model_Xml_Request extends PlanetPayment_IpayGate
|
|
176 |
|
177 |
return $this;
|
178 |
}
|
179 |
-
|
180 |
/**
|
181 |
* Generates the Transaction Xml for authorization
|
182 |
* @return PlanetPayment_IpayGateway_Model_Xml_Request
|
@@ -226,12 +220,11 @@ class PlanetPayment_IpayGateway_Model_Xml_Request extends PlanetPayment_IpayGate
|
|
226 |
$fields->addChild('CURRENCY_INDICATOR', '0');
|
227 |
}
|
228 |
$fields->addChild('TRANSACTION_INDICATOR', '7');
|
229 |
-
|
230 |
-
|
231 |
-
|
|
|
232 |
$this->setTransactionForLog($request);
|
233 |
-
|
234 |
-
|
235 |
if ($hasEncryption) {
|
236 |
$this->_encryptRequest($request);
|
237 |
}
|
@@ -277,15 +270,13 @@ class PlanetPayment_IpayGateway_Model_Xml_Request extends PlanetPayment_IpayGate
|
|
277 |
$fields->addChild('ACCOUNT_NUMBER', $payment->getCcNumber());
|
278 |
}
|
279 |
$fields->addChild('QUERY_TYPE', '0');
|
280 |
-
|
281 |
-
|
|
|
282 |
$this->setTransactionForLog($request);
|
283 |
-
|
284 |
-
|
285 |
if ($hasEncryption) {
|
286 |
$this->_encryptRequest($request);
|
287 |
}
|
288 |
-
|
289 |
$this->setTransaction($request);
|
290 |
} catch (Exception $e) {
|
291 |
Mage::throwException($e->getmessage());
|
@@ -315,8 +306,9 @@ class PlanetPayment_IpayGateway_Model_Xml_Request extends PlanetPayment_IpayGate
|
|
315 |
$fields->addChild('SERVICE_TYPE', 'RATE');
|
316 |
$fields->addChild('SERVICE_SUBTYPE', 'QUERY');
|
317 |
$fields->addChild('QUERY_TYPE', '1');
|
318 |
-
|
319 |
-
|
|
|
320 |
$this->setTransactionForLog($request);
|
321 |
$this->setCurrencyRate(true);
|
322 |
|
@@ -366,15 +358,13 @@ class PlanetPayment_IpayGateway_Model_Xml_Request extends PlanetPayment_IpayGate
|
|
366 |
$fields->addChild('EXPIRATION', $this->_getCcExpiration($profile->getExpirationMonth(), $profile->getExpirationYear()));
|
367 |
$fields->addChild('CVV', $profile->getCardCode());
|
368 |
$fields->addChild('BILLING_TRANSACTION', '2');
|
369 |
-
|
370 |
-
|
|
|
371 |
$this->setTransactionForLog($request);
|
372 |
-
|
373 |
-
|
374 |
if ($hasEncryption) {
|
375 |
$this->_encryptRequest($request);
|
376 |
}
|
377 |
-
|
378 |
$this->setTransaction($request);
|
379 |
} else {
|
380 |
Mage::throwException("failed to create payment profile");
|
@@ -415,15 +405,13 @@ class PlanetPayment_IpayGateway_Model_Xml_Request extends PlanetPayment_IpayGate
|
|
415 |
$fields->addChild('POSTAL_CODE', $this->_conditionPostalCode($profile->getZip()));
|
416 |
$fields->addChild('STATE', htmlentities($profile->getState(), ENT_QUOTES));
|
417 |
$fields->addChild('COUNTRY', htmlentities($profile->getCountry(), ENT_QUOTES));
|
418 |
-
|
419 |
-
|
|
|
420 |
$this->setTransactionForLog($request);
|
421 |
-
|
422 |
-
|
423 |
if ($hasEncryption) {
|
424 |
$this->_encryptRequest($request);
|
425 |
}
|
426 |
-
|
427 |
$this->setTransaction($request);
|
428 |
} else {
|
429 |
Mage::throwException("failed to Update payment profile");
|
@@ -461,11 +449,10 @@ class PlanetPayment_IpayGateway_Model_Xml_Request extends PlanetPayment_IpayGate
|
|
461 |
$fields->addChild('TRANSACTION_INDICATOR', '7');
|
462 |
$fields->addChild('EXPIRATION', $this->_getCcExpiration($profile->getExpirationMonth(), $profile->getExpirationYear()));
|
463 |
$fields->addChild('CVV', $profile->getCardCode());
|
464 |
-
|
465 |
-
|
|
|
466 |
$this->setTransactionForLog($request);
|
467 |
-
|
468 |
-
|
469 |
if ($hasEncryption) {
|
470 |
$this->_encryptRequest($request);
|
471 |
} else {
|
@@ -505,8 +492,9 @@ class PlanetPayment_IpayGateway_Model_Xml_Request extends PlanetPayment_IpayGate
|
|
505 |
$fields->addChild('TERMINAL_ID', $this->_getConfig('terminal_id', 'general'));
|
506 |
$fields->addChild('PIN', $this->_getConfig('pin', 'general'));
|
507 |
$fields->addChild('CLIENT_ID', $profile->getClientId());
|
508 |
-
|
509 |
-
|
|
|
510 |
$this->setTransactionForLog($request);
|
511 |
|
512 |
if ($hasEncryption) {
|
@@ -542,8 +530,9 @@ class PlanetPayment_IpayGateway_Model_Xml_Request extends PlanetPayment_IpayGate
|
|
542 |
$fields->addChild('SERVICE_FORMAT', '0000');
|
543 |
$fields->addChild('TERMINAL_ID', $this->_getConfig('terminal_id', 'general'));
|
544 |
$fields->addChild('PIN', $this->_getConfig('pin', 'general'));
|
545 |
-
|
546 |
-
|
|
|
547 |
$this->setTransactionForLog($request);
|
548 |
|
549 |
if ($hasEncryption) {
|
@@ -557,7 +546,6 @@ class PlanetPayment_IpayGateway_Model_Xml_Request extends PlanetPayment_IpayGate
|
|
557 |
|
558 |
return $this;
|
559 |
}
|
560 |
-
|
561 |
public function generateRequestForCapture() {
|
562 |
try {
|
563 |
$payment = $this->getPayment();
|
@@ -595,14 +583,13 @@ class PlanetPayment_IpayGateway_Model_Xml_Request extends PlanetPayment_IpayGate
|
|
595 |
$fields->addChild('SERVICE_SUBTYPE', 'CAPTURE');
|
596 |
$fields->addChild('AMOUNT', $this->getAmountInStoreCurrency());
|
597 |
$fields->addChild('PIN', $this->_getConfig('pin', 'general'));
|
598 |
-
|
599 |
-
|
|
|
600 |
$this->setTransactionForLog($request);
|
601 |
-
|
602 |
if ($hasEncryption) {
|
603 |
$this->_encryptRequest($request);
|
604 |
}
|
605 |
-
|
606 |
$this->setTransaction($request);
|
607 |
} else {
|
608 |
Mage::throwException("Unable to capture");
|
@@ -610,11 +597,9 @@ class PlanetPayment_IpayGateway_Model_Xml_Request extends PlanetPayment_IpayGate
|
|
610 |
} catch (Exception $e) {
|
611 |
Mage::throwException($e->getmessage());
|
612 |
}
|
613 |
-
|
614 |
return $this;
|
615 |
}
|
616 |
-
|
617 |
-
public function generateRequestForSale() {
|
618 |
try {
|
619 |
$payment = $this->getPayment();
|
620 |
$quote = Mage::helper('ipay')->getQuote();
|
@@ -646,7 +631,7 @@ class PlanetPayment_IpayGateway_Model_Xml_Request extends PlanetPayment_IpayGate
|
|
646 |
$fields->addChild('FIRST_NAME', $billingAddress->getFirstname());
|
647 |
$fields->addChild('LAST_NAME', $billingAddress->getLastname());
|
648 |
$fields->addChild('ADDRESS', $this->_conditionAddress($billingAddress->getStreet(1)));
|
649 |
-
|
650 |
$fields->addChild('CITY', $billingAddress->getCity());
|
651 |
$fields->addChild('POSTAL_CODE', $this->_conditionPostalCode($billingAddress->getPostcode()));
|
652 |
}
|
@@ -671,9 +656,10 @@ class PlanetPayment_IpayGateway_Model_Xml_Request extends PlanetPayment_IpayGate
|
|
671 |
}
|
672 |
$fields->addChild('ENTRY_MODE', '3');
|
673 |
$fields->addChild('TRANSACTION_INDICATOR', '7');
|
674 |
-
|
675 |
-
|
676 |
-
|
|
|
677 |
$this->setTransactionForLog($request);
|
678 |
|
679 |
if ($hasEncryption) {
|
@@ -705,14 +691,13 @@ class PlanetPayment_IpayGateway_Model_Xml_Request extends PlanetPayment_IpayGate
|
|
705 |
$fields->addChild('SERVICE_TYPE', 'DEBIT');
|
706 |
$fields->addChild('SERVICE_SUBTYPE', 'VOID');
|
707 |
$fields->addChild('PIN', $this->_getConfig('pin', 'general'));
|
708 |
-
|
709 |
-
|
|
|
710 |
$this->setTransactionForLog($request);
|
711 |
-
|
712 |
if ($hasEncryption) {
|
713 |
$this->_encryptRequest($request);
|
714 |
}
|
715 |
-
|
716 |
$this->setTransaction($request);
|
717 |
} else {
|
718 |
Mage::throwException("Unable to Void");
|
@@ -762,14 +747,13 @@ class PlanetPayment_IpayGateway_Model_Xml_Request extends PlanetPayment_IpayGate
|
|
762 |
$fields->addChild('SERVICE_TYPE', 'CREDIT');
|
763 |
$fields->addChild('SERVICE_SUBTYPE', 'REFUND');
|
764 |
$fields->addChild('PIN', $this->_getConfig('pin', 'general'));
|
765 |
-
|
766 |
-
|
|
|
767 |
$this->setTransactionForLog($request);
|
768 |
-
|
769 |
if ($hasEncryption) {
|
770 |
$this->_encryptRequest($request);
|
771 |
}
|
772 |
-
|
773 |
$this->setTransaction($request);
|
774 |
} else {
|
775 |
Mage::throwException("Unable to Refund");
|
@@ -777,14 +761,45 @@ class PlanetPayment_IpayGateway_Model_Xml_Request extends PlanetPayment_IpayGate
|
|
777 |
} catch (Exception $e) {
|
778 |
Mage::throwException($e->getmessage());
|
779 |
}
|
780 |
-
|
781 |
return $this;
|
782 |
}
|
783 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
784 |
/**
|
785 |
* Sending the request to Planet Payment
|
786 |
* @return PlanetPayment_IpayGateway_Model_Xml_Request
|
787 |
-
|
788 |
public function send() {
|
789 |
$transaction = $this->getTransaction();
|
790 |
if ($transaction) {
|
@@ -806,7 +821,7 @@ class PlanetPayment_IpayGateway_Model_Xml_Request extends PlanetPayment_IpayGate
|
|
806 |
$client->setRawData($transaction->asXML(), 'text/xml');
|
807 |
$client->setMethod(Zend_Http_Client::POST);
|
808 |
$response = $client->request()->getBody();
|
809 |
-
|
810 |
//Setting response to response model object
|
811 |
$responseModel = $this->_getResponseModel();
|
812 |
$responseModel->setIpayRequest($this);
|
@@ -821,5 +836,4 @@ class PlanetPayment_IpayGateway_Model_Xml_Request extends PlanetPayment_IpayGate
|
|
821 |
Mage::throwException('invalid Transaction');
|
822 |
}
|
823 |
}
|
824 |
-
|
825 |
-
}
|
1 |
<?php
|
|
|
2 |
/**
|
3 |
* One Pica
|
4 |
*
|
111 |
public function generateRequestForPycAuth() {
|
112 |
try {
|
113 |
$payment = $this->getPayment();
|
|
|
114 |
$profile = $this->_getProfile($payment->getIpayProfileId());
|
115 |
$quote = Mage::helper('ipay')->getQuote();
|
|
|
116 |
$billingAddress = $quote->getBillingAddress();
|
|
|
117 |
$hasEncryption = $this->_hasEncryption();
|
|
|
118 |
$key = $this->_getConfig('key', 'general');
|
119 |
$encryption = $hasEncryption ? '1' : '0';
|
|
|
120 |
$request = $this->_getRootNode();
|
121 |
$transaction = $request->addChild('TRANSACTION');
|
122 |
$fields = $transaction->addChild('FIELDS');
|
136 |
$fields->addChild('FIRST_NAME', $billingAddress->getFirstname());
|
137 |
$fields->addChild('LAST_NAME', $billingAddress->getLastname());
|
138 |
$fields->addChild('ADDRESS', $this->_conditionAddress($billingAddress->getStreet(1)));
|
139 |
+
$fields->addChild('STATE', $billingAddress->getRegionCode());
|
140 |
$fields->addChild('CITY', $billingAddress->getCity());
|
141 |
$fields->addChild('POSTAL_CODE', $this->_conditionPostalCode($billingAddress->getPostcode()));
|
142 |
}
|
143 |
|
144 |
$fields->addChild('AMOUNT', $this->getAmount());
|
145 |
$fields->addChild('CURRENCY_CODE', $this->_getCurrencyIsoCode($this->getNativeCurrency()));
|
146 |
+
|
147 |
//If a different currecy is selected by the customer
|
148 |
if ($payment->getId() && $payment->getIpayCurrencyCode()) {
|
149 |
if ($payment->getIpayCurrencyCode() == $this->getNativeCurrency()) {
|
155 |
$fields->addChild('CURRENCY_INDICATOR', '0');
|
156 |
}
|
157 |
$fields->addChild('TRANSACTION_INDICATOR', '7');
|
158 |
+
$fields->addChild('FESP_IND', '9');
|
159 |
+
//Appear duplicate data so commenting it out..@Diwakar - Date
|
160 |
+
//$fields->addChild('USER_DATA_0', $this->_getClientName());
|
161 |
+
//Sending Few Additional data to Gateway
|
162 |
+
$this->addAdditionalData($fields, true);
|
163 |
$this->setTransactionForLog($request);
|
164 |
+
if($hasEncryption) {
|
|
|
|
|
165 |
$this->_encryptRequest($request);
|
166 |
}
|
167 |
$this->setTransaction($request);
|
171 |
|
172 |
return $this;
|
173 |
}
|
|
|
174 |
/**
|
175 |
* Generates the Transaction Xml for authorization
|
176 |
* @return PlanetPayment_IpayGateway_Model_Xml_Request
|
220 |
$fields->addChild('CURRENCY_INDICATOR', '0');
|
221 |
}
|
222 |
$fields->addChild('TRANSACTION_INDICATOR', '7');
|
223 |
+
$fields->addChild('FESP_IND', '9');
|
224 |
+
$fields->addChild('USER_DATA_0', $this->_getClientName());
|
225 |
+
//Sending Few Additional data to Gateway
|
226 |
+
$this->addAdditionalData($fields, true);
|
227 |
$this->setTransactionForLog($request);
|
|
|
|
|
228 |
if ($hasEncryption) {
|
229 |
$this->_encryptRequest($request);
|
230 |
}
|
270 |
$fields->addChild('ACCOUNT_NUMBER', $payment->getCcNumber());
|
271 |
}
|
272 |
$fields->addChild('QUERY_TYPE', '0');
|
273 |
+
$fields->addChild('FESP_IND', '9');
|
274 |
+
//Sending Few Additional data to Gateway
|
275 |
+
$this->addAdditionalData($fields, true);
|
276 |
$this->setTransactionForLog($request);
|
|
|
|
|
277 |
if ($hasEncryption) {
|
278 |
$this->_encryptRequest($request);
|
279 |
}
|
|
|
280 |
$this->setTransaction($request);
|
281 |
} catch (Exception $e) {
|
282 |
Mage::throwException($e->getmessage());
|
306 |
$fields->addChild('SERVICE_TYPE', 'RATE');
|
307 |
$fields->addChild('SERVICE_SUBTYPE', 'QUERY');
|
308 |
$fields->addChild('QUERY_TYPE', '1');
|
309 |
+
$fields->addChild('FESP_IND', '9');
|
310 |
+
//Sending Few Additional data to Gateway
|
311 |
+
$this->addAdditionalData($fields, true);
|
312 |
$this->setTransactionForLog($request);
|
313 |
$this->setCurrencyRate(true);
|
314 |
|
358 |
$fields->addChild('EXPIRATION', $this->_getCcExpiration($profile->getExpirationMonth(), $profile->getExpirationYear()));
|
359 |
$fields->addChild('CVV', $profile->getCardCode());
|
360 |
$fields->addChild('BILLING_TRANSACTION', '2');
|
361 |
+
$fields->addChild('FESP_IND', '9');
|
362 |
+
//Sending Few Additional data to Gateway
|
363 |
+
$this->addAdditionalData($fields, true);
|
364 |
$this->setTransactionForLog($request);
|
|
|
|
|
365 |
if ($hasEncryption) {
|
366 |
$this->_encryptRequest($request);
|
367 |
}
|
|
|
368 |
$this->setTransaction($request);
|
369 |
} else {
|
370 |
Mage::throwException("failed to create payment profile");
|
405 |
$fields->addChild('POSTAL_CODE', $this->_conditionPostalCode($profile->getZip()));
|
406 |
$fields->addChild('STATE', htmlentities($profile->getState(), ENT_QUOTES));
|
407 |
$fields->addChild('COUNTRY', htmlentities($profile->getCountry(), ENT_QUOTES));
|
408 |
+
$fields->addChild('FESP_IND', '9');
|
409 |
+
//Sending Few Additional data to Gateway
|
410 |
+
$this->addAdditionalData($fields, true);
|
411 |
$this->setTransactionForLog($request);
|
|
|
|
|
412 |
if ($hasEncryption) {
|
413 |
$this->_encryptRequest($request);
|
414 |
}
|
|
|
415 |
$this->setTransaction($request);
|
416 |
} else {
|
417 |
Mage::throwException("failed to Update payment profile");
|
449 |
$fields->addChild('TRANSACTION_INDICATOR', '7');
|
450 |
$fields->addChild('EXPIRATION', $this->_getCcExpiration($profile->getExpirationMonth(), $profile->getExpirationYear()));
|
451 |
$fields->addChild('CVV', $profile->getCardCode());
|
452 |
+
$fields->addChild('FESP_IND', '9');
|
453 |
+
//Sending Few Additional data to Gateway
|
454 |
+
$this->addAdditionalData($fields, true);
|
455 |
$this->setTransactionForLog($request);
|
|
|
|
|
456 |
if ($hasEncryption) {
|
457 |
$this->_encryptRequest($request);
|
458 |
} else {
|
492 |
$fields->addChild('TERMINAL_ID', $this->_getConfig('terminal_id', 'general'));
|
493 |
$fields->addChild('PIN', $this->_getConfig('pin', 'general'));
|
494 |
$fields->addChild('CLIENT_ID', $profile->getClientId());
|
495 |
+
$fields->addChild('FESP_IND', '9');
|
496 |
+
//Sending Few Additional data to Gateway
|
497 |
+
$this->addAdditionalData($fields, false);
|
498 |
$this->setTransactionForLog($request);
|
499 |
|
500 |
if ($hasEncryption) {
|
530 |
$fields->addChild('SERVICE_FORMAT', '0000');
|
531 |
$fields->addChild('TERMINAL_ID', $this->_getConfig('terminal_id', 'general'));
|
532 |
$fields->addChild('PIN', $this->_getConfig('pin', 'general'));
|
533 |
+
$fields->addChild('FESP_IND', '9');
|
534 |
+
//Sending Few Additional data to Gateway
|
535 |
+
$this->addAdditionalData($fields, false);
|
536 |
$this->setTransactionForLog($request);
|
537 |
|
538 |
if ($hasEncryption) {
|
546 |
|
547 |
return $this;
|
548 |
}
|
|
|
549 |
public function generateRequestForCapture() {
|
550 |
try {
|
551 |
$payment = $this->getPayment();
|
583 |
$fields->addChild('SERVICE_SUBTYPE', 'CAPTURE');
|
584 |
$fields->addChild('AMOUNT', $this->getAmountInStoreCurrency());
|
585 |
$fields->addChild('PIN', $this->_getConfig('pin', 'general'));
|
586 |
+
$fields->addChild('FESP_IND', '9');
|
587 |
+
//Sending Few Additional data to Gateway
|
588 |
+
$this->addAdditionalData($fields, true);
|
589 |
$this->setTransactionForLog($request);
|
|
|
590 |
if ($hasEncryption) {
|
591 |
$this->_encryptRequest($request);
|
592 |
}
|
|
|
593 |
$this->setTransaction($request);
|
594 |
} else {
|
595 |
Mage::throwException("Unable to capture");
|
597 |
} catch (Exception $e) {
|
598 |
Mage::throwException($e->getmessage());
|
599 |
}
|
|
|
600 |
return $this;
|
601 |
}
|
602 |
+
public function generateRequestForSale() {
|
|
|
603 |
try {
|
604 |
$payment = $this->getPayment();
|
605 |
$quote = Mage::helper('ipay')->getQuote();
|
631 |
$fields->addChild('FIRST_NAME', $billingAddress->getFirstname());
|
632 |
$fields->addChild('LAST_NAME', $billingAddress->getLastname());
|
633 |
$fields->addChild('ADDRESS', $this->_conditionAddress($billingAddress->getStreet(1)));
|
634 |
+
$fields->addChild('STATE', $billingAddress->getRegionCode());
|
635 |
$fields->addChild('CITY', $billingAddress->getCity());
|
636 |
$fields->addChild('POSTAL_CODE', $this->_conditionPostalCode($billingAddress->getPostcode()));
|
637 |
}
|
656 |
}
|
657 |
$fields->addChild('ENTRY_MODE', '3');
|
658 |
$fields->addChild('TRANSACTION_INDICATOR', '7');
|
659 |
+
$fields->addChild('FESP_IND', '9');
|
660 |
+
$fields->addChild('USER_DATA_0', $this->_getClientName());
|
661 |
+
//Sending Few Additional data to Gateway
|
662 |
+
$this->addAdditionalData($fields, true);
|
663 |
$this->setTransactionForLog($request);
|
664 |
|
665 |
if ($hasEncryption) {
|
691 |
$fields->addChild('SERVICE_TYPE', 'DEBIT');
|
692 |
$fields->addChild('SERVICE_SUBTYPE', 'VOID');
|
693 |
$fields->addChild('PIN', $this->_getConfig('pin', 'general'));
|
694 |
+
$fields->addChild('FESP_IND', '9');
|
695 |
+
//Sending Few Additional data to Gateway
|
696 |
+
$this->addAdditionalData($fields, true);
|
697 |
$this->setTransactionForLog($request);
|
|
|
698 |
if ($hasEncryption) {
|
699 |
$this->_encryptRequest($request);
|
700 |
}
|
|
|
701 |
$this->setTransaction($request);
|
702 |
} else {
|
703 |
Mage::throwException("Unable to Void");
|
747 |
$fields->addChild('SERVICE_TYPE', 'CREDIT');
|
748 |
$fields->addChild('SERVICE_SUBTYPE', 'REFUND');
|
749 |
$fields->addChild('PIN', $this->_getConfig('pin', 'general'));
|
750 |
+
$fields->addChild('FESP_IND', '9');
|
751 |
+
//Sending Few Additional data to Gateway
|
752 |
+
$this->addAdditionalData($fields, true);
|
753 |
$this->setTransactionForLog($request);
|
|
|
754 |
if ($hasEncryption) {
|
755 |
$this->_encryptRequest($request);
|
756 |
}
|
|
|
757 |
$this->setTransaction($request);
|
758 |
} else {
|
759 |
Mage::throwException("Unable to Refund");
|
761 |
} catch (Exception $e) {
|
762 |
Mage::throwException($e->getmessage());
|
763 |
}
|
|
|
764 |
return $this;
|
765 |
}
|
766 |
+
/**
|
767 |
+
* Adding Order Id and Incremented Order id and Customer Ip to Request XML
|
768 |
+
*
|
769 |
+
* @param obj $fields
|
770 |
+
* */
|
771 |
+
public function addAdditionalData($fields, $frontrequest = false) {
|
772 |
+
$payment = $this->getPayment();
|
773 |
+
if ($payment) {
|
774 |
+
$order = $payment->getOrder(); //to create a order object
|
775 |
+
//Set User data
|
776 |
+
if ($order) {
|
777 |
+
$fields->addChild('TICKET', $order->getIncrementId());
|
778 |
+
$fields->addChild('USER_DATA_1', $order->getId());
|
779 |
+
$fields->addChild('CLIENT_IP', $order->getData('remote_ip'));
|
780 |
+
//Get Store Details from where order placed...
|
781 |
+
$store = str_replace(array("<br>", "\n", "\r"), '-', $order->getData('store_name'));
|
782 |
+
$stores = explode("-", $store);
|
783 |
+
//$store = Mage::app()->getStore($order->getData('store_id'));
|
784 |
+
$fields->addChild('USER_DATA_3', $stores[0]);
|
785 |
+
$fields->addChild('USER_DATA_4', $stores[1]);
|
786 |
+
$fields->addChild('USER_DATA_5', $stores[2]);
|
787 |
+
$frontrequest = false;
|
788 |
+
}
|
789 |
+
}
|
790 |
+
if ($frontrequest) {
|
791 |
+
$fields->addChild('CLIENT_IP', $_SERVER['REMOTE_ADDR']);
|
792 |
+
$fields->addChild('USER_DATA_3', Mage::app()->getWebsite()->getName());
|
793 |
+
$fields->addChild('USER_DATA_4', Mage::app()->getGroup()->getName());
|
794 |
+
$fields->addChild('USER_DATA_5', Mage::app()->getStore()->getName());
|
795 |
+
}
|
796 |
+
$fields->addChild('USER_DATA_6', (string) Mage::getResourceModel('core/resource')->getDbVersion('ipay_setup'));
|
797 |
+
$fields->addChild('USER_DATA_7', Mage::getVersion());
|
798 |
+
}
|
799 |
/**
|
800 |
* Sending the request to Planet Payment
|
801 |
* @return PlanetPayment_IpayGateway_Model_Xml_Request
|
802 |
+
**/
|
803 |
public function send() {
|
804 |
$transaction = $this->getTransaction();
|
805 |
if ($transaction) {
|
821 |
$client->setRawData($transaction->asXML(), 'text/xml');
|
822 |
$client->setMethod(Zend_Http_Client::POST);
|
823 |
$response = $client->request()->getBody();
|
824 |
+
|
825 |
//Setting response to response model object
|
826 |
$responseModel = $this->_getResponseModel();
|
827 |
$responseModel->setIpayRequest($this);
|
836 |
Mage::throwException('invalid Transaction');
|
837 |
}
|
838 |
}
|
839 |
+
}
|
|
app/code/community/PlanetPayment/IpayGateway/Model/Xml/Response.php
CHANGED
@@ -54,6 +54,10 @@ class PlanetPayment_IpayGateway_Model_Xml_Response extends PlanetPayment_IpayGat
|
|
54 |
$loggedInfo = Mage::helper('ipay')->log($requestXml, $this->_responseXml->asXML(), $this->_getRequestObject()->getCurrencyRate());
|
55 |
//This will be saved in log file if any error occured while Auth.
|
56 |
//The database transaction will be rolled back if error.
|
|
|
|
|
|
|
|
|
57 |
$this->setlogInfo("\n \t Request:" . $loggedInfo->getRequest() . "\n \t Response:" . $loggedInfo->getResponse());
|
58 |
} else {
|
59 |
Mage::throwException('Invalid response');
|
54 |
$loggedInfo = Mage::helper('ipay')->log($requestXml, $this->_responseXml->asXML(), $this->_getRequestObject()->getCurrencyRate());
|
55 |
//This will be saved in log file if any error occured while Auth.
|
56 |
//The database transaction will be rolled back if error.
|
57 |
+
|
58 |
+
Mage::log("Print Request : " . $loggedInfo->getRequest(), null, PlanetPayment_IpayGateway_Model_Ipay::LOG_FILE, true);
|
59 |
+
Mage::log("Print Response : " . $loggedInfo->getResponse(), null, PlanetPayment_IpayGateway_Model_Ipay::LOG_FILE, true);
|
60 |
+
|
61 |
$this->setlogInfo("\n \t Request:" . $loggedInfo->getRequest() . "\n \t Response:" . $loggedInfo->getResponse());
|
62 |
} else {
|
63 |
Mage::throwException('Invalid response');
|
app/code/community/PlanetPayment/IpayGateway/controllers/OnepageController.php
CHANGED
@@ -79,7 +79,9 @@ class PlanetPayment_IpayGateway_OnepageController extends Mage_Checkout_OnepageC
|
|
79 |
//Checking whether the request succeed
|
80 |
if ($response->isSuccess()) {
|
81 |
$quote->setIpayExchangeRate($response->getPycExchangeRate())
|
82 |
-
|
|
|
|
|
83 |
//Loading Currency section if request succeed
|
84 |
$this->loadLayout('checkout_onepage_ipay');
|
85 |
$result['goto_section'] = 'currency_selector';
|
79 |
//Checking whether the request succeed
|
80 |
if ($response->isSuccess()) {
|
81 |
$quote->setIpayExchangeRate($response->getPycExchangeRate())
|
82 |
+
->setIpayMarkup($response->getMarkUp())
|
83 |
+
->setIpayServiceUsed(Mage::getStoreConfig('payment/ipay/service'))
|
84 |
+
->save();
|
85 |
//Loading Currency section if request succeed
|
86 |
$this->loadLayout('checkout_onepage_ipay');
|
87 |
$result['goto_section'] = 'currency_selector';
|
app/code/community/PlanetPayment/IpayGateway/etc/config.xml
CHANGED
@@ -130,6 +130,12 @@
|
|
130 |
<ipay_exchange_rate>
|
131 |
<to_order_payment>*</to_order_payment>
|
132 |
</ipay_exchange_rate>
|
|
|
|
|
|
|
|
|
|
|
|
|
133 |
</sales_convert_quote_payment>
|
134 |
|
135 |
<!-- Order to Order (edit) -->
|
@@ -403,6 +409,20 @@
|
|
403 |
</observers>
|
404 |
</sales_order_place_before>
|
405 |
</events>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
406 |
</global>
|
407 |
<frontend>
|
408 |
<layout>
|
130 |
<ipay_exchange_rate>
|
131 |
<to_order_payment>*</to_order_payment>
|
132 |
</ipay_exchange_rate>
|
133 |
+
<ipay_markup>
|
134 |
+
<to_order_payment>*</to_order_payment>
|
135 |
+
</ipay_markup>
|
136 |
+
<ipay_service_used>
|
137 |
+
<to_order_payment>*</to_order_payment>
|
138 |
+
</ipay_service_used>
|
139 |
</sales_convert_quote_payment>
|
140 |
|
141 |
<!-- Order to Order (edit) -->
|
409 |
</observers>
|
410 |
</sales_order_place_before>
|
411 |
</events>
|
412 |
+
<template>
|
413 |
+
<email>
|
414 |
+
<sales_email_order_template translate="label" module="sales">
|
415 |
+
<label>New Order</label>
|
416 |
+
<file>sales/ipay/order_new.html</file>
|
417 |
+
<type>html</type>
|
418 |
+
</sales_email_order_template>
|
419 |
+
<sales_email_order_guest_template translate="label" module="sales">
|
420 |
+
<label>New Order for Guest</label>
|
421 |
+
<file>sales/ipay/order_new_guest.html</file>
|
422 |
+
<type>html</type>
|
423 |
+
</sales_email_order_guest_template>
|
424 |
+
</email>
|
425 |
+
</template>
|
426 |
</global>
|
427 |
<frontend>
|
428 |
<layout>
|
app/code/community/PlanetPayment/IpayGateway/sql/ipay_setup/mysql4-upgrade-1.0.0-1.0.1.php
CHANGED
@@ -1,12 +1,14 @@
|
|
1 |
-
<?php
|
2 |
-
|
3 |
-
$installer = $this;
|
4 |
-
/* @var $installer Mage_Customer_Model_Entity_Setup */
|
5 |
-
|
6 |
-
$installer->startSetup();
|
7 |
-
|
8 |
-
// Sales Quote & Order entities
|
9 |
-
$installer->getConnection()->addColumn($installer->getTable('sales/order_payment'), 'ipay_exchange_rate', 'float(15,6)');
|
10 |
-
|
11 |
-
|
12 |
-
|
|
|
|
1 |
+
<?php
|
2 |
+
|
3 |
+
$installer = $this;
|
4 |
+
/* @var $installer Mage_Customer_Model_Entity_Setup */
|
5 |
+
|
6 |
+
$installer->startSetup();
|
7 |
+
|
8 |
+
// Sales Quote & Order entities
|
9 |
+
$installer->getConnection()->addColumn($installer->getTable('sales/order_payment'), 'ipay_exchange_rate', 'float(15,6)');
|
10 |
+
$installer->getConnection()->addColumn($installer->getTable('sales/order_payment'), 'ipay_markup', 'varchar(15)');
|
11 |
+
$installer->getConnection()->addColumn($installer->getTable('sales/order_payment'), 'ipay_service_used', 'varchar(10)');
|
12 |
+
|
13 |
+
|
14 |
+
$installer->endSetup();
|
app/code/community/PlanetPayment/IpayGateway/sql/ipay_setup/mysql4-upgrade-1.0.1-1.0.2.php
CHANGED
@@ -1,12 +1,13 @@
|
|
1 |
-
<?php
|
2 |
-
|
3 |
-
$installer = $this;
|
4 |
-
/* @var $installer Mage_Customer_Model_Entity_Setup */
|
5 |
-
|
6 |
-
$installer->startSetup();
|
7 |
-
|
8 |
-
// Sales Quote & Order entities
|
9 |
-
$installer->getConnection()->addColumn($installer->getTable('sales/quote'), 'ipay_exchange_rate', 'float(15,6)');
|
10 |
-
|
11 |
-
|
12 |
-
|
|
1 |
+
<?php
|
2 |
+
|
3 |
+
$installer = $this;
|
4 |
+
/* @var $installer Mage_Customer_Model_Entity_Setup */
|
5 |
+
|
6 |
+
$installer->startSetup();
|
7 |
+
|
8 |
+
// Sales Quote & Order entities
|
9 |
+
$installer->getConnection()->addColumn($installer->getTable('sales/quote'), 'ipay_exchange_rate', 'float(15,6)');
|
10 |
+
$installer->getConnection()->addColumn($installer->getTable('sales/quote'), 'ipay_markup', 'varchar(15)');
|
11 |
+
$installer->getConnection()->addColumn($installer->getTable('sales/quote'), 'ipay_service_used', 'varchar(10)');
|
12 |
+
|
13 |
+
$installer->endSetup();
|
app/design/frontend/base/default/layout/ipay.xml
CHANGED
@@ -41,4 +41,12 @@
|
|
41 |
<remove name="left"/>
|
42 |
<block type="ipay/onepage_ipay" name="root" output="toHtml" template="ipay/checkout/onepage/currency_selector.phtml"/>
|
43 |
</checkout_onepage_ipay>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
44 |
</layout>
|
41 |
<remove name="left"/>
|
42 |
<block type="ipay/onepage_ipay" name="root" output="toHtml" template="ipay/checkout/onepage/currency_selector.phtml"/>
|
43 |
</checkout_onepage_ipay>
|
44 |
+
|
45 |
+
<sales_email_order_items>
|
46 |
+
<reference name="order_totals">
|
47 |
+
<action method="setTemplate">
|
48 |
+
<template>ipay/sales/order/totals.phtml</template>
|
49 |
+
</action>
|
50 |
+
</reference>
|
51 |
+
</sales_email_order_items>
|
52 |
</layout>
|
app/design/frontend/base/default/template/ipay/email/order/ipay_custom.phtml
ADDED
@@ -0,0 +1,41 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/*
|
3 |
+
|
4 |
+
CTG081113
|
5 |
+
papdot242@gmail.com
|
6 |
+
|
7 |
+
getIpayExchangeRate()
|
8 |
+
|
9 |
+
*/
|
10 |
+
|
11 |
+
$_order = $this->getData('order');
|
12 |
+
|
13 |
+
?>
|
14 |
+
|
15 |
+
<?php if($_order->getPayment()->getMethod() == 'ipay' && $_order->getPayment()->getIpayServiceUsed() == 'pyc') : ?>
|
16 |
+
<td bgcolor="#EAEAEA" align="center" style="background:#EAEAEA; text-align:center; height: 65px;">
|
17 |
+
<p style="text-align: left;">
|
18 |
+
<?php if($_order->getPayment()->getCcType() == 'VI'): ?>
|
19 |
+
I have been offered a choice of payment currencies, including USD. This currency conversion service is offered <br />
|
20 |
+
by this merchant. * Wholesale rate <?php echo $_order->getPayment()->getIpayMarkup();?>%.
|
21 |
+
<?php elseif($_order->getPayment()->getCcType() == 'MC'): ?>
|
22 |
+
I have chosen not to use the MasterCard currency conversion process and agree that I will have no recourse against MasterCard concerning the currency conversion or its disclosure.
|
23 |
+
<?php endif; ?>
|
24 |
+
</p>
|
25 |
+
<?php else: ?>
|
26 |
+
<td bgcolor="#EAEAEA" align="center" style="background:#EAEAEA; text-align:center;">
|
27 |
+
<center><p style="font-size:12px; margin:0;">Thank you, <strong><?php echo Mage::app()->getStore()->getFrontendName(); ?></strong></p></center>
|
28 |
+
<?php endif; ?>
|
29 |
+
</td>
|
30 |
+
|
31 |
+
|
32 |
+
|
33 |
+
|
34 |
+
|
35 |
+
|
36 |
+
|
37 |
+
|
38 |
+
|
39 |
+
|
40 |
+
|
41 |
+
|
app/design/frontend/base/default/template/ipay/sales/order/totals.phtml
ADDED
@@ -0,0 +1,85 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* Magento
|
4 |
+
*
|
5 |
+
* NOTICE OF LICENSE
|
6 |
+
*
|
7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
9 |
+
* It is also available through the world-wide-web at this URL:
|
10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
11 |
+
* If you did not receive a copy of the license and are unable to
|
12 |
+
* obtain it through the world-wide-web, please send an email
|
13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
14 |
+
*
|
15 |
+
* DISCLAIMER
|
16 |
+
*
|
17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
18 |
+
* versions in the future. If you wish to customize Magento for your
|
19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
20 |
+
*
|
21 |
+
* @category design
|
22 |
+
* @package base_default
|
23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
25 |
+
*/
|
26 |
+
/**
|
27 |
+
* @var $this Mage_Sales_Block_Order_Totals
|
28 |
+
* @see Mage_Sales_Block_Order_Totals
|
29 |
+
*/
|
30 |
+
|
31 |
+
$_grand_total_p = 0;
|
32 |
+
|
33 |
+
?>
|
34 |
+
<?php foreach ($this->getTotals() as $_code => $_total): ?>
|
35 |
+
<?php if(trim($_total->getLabel()) != 'Grand Total to be Charged') : ?>
|
36 |
+
<?php if ($_total->getBlockName()): ?>
|
37 |
+
<?php echo $this->getChildHtml($_total->getBlockName(), false); ?>
|
38 |
+
<?php else:?>
|
39 |
+
<tr class="<?php echo $_code?>">
|
40 |
+
<td <?php echo $this->getLabelProperties()?>>
|
41 |
+
<?php if ($_total->getStrong()):?>
|
42 |
+
<strong><?php echo $this->escapeHtml($_total->getLabel());?></strong>
|
43 |
+
<?php else:?>
|
44 |
+
<?php echo $this->escapeHtml($_total->getLabel());?>
|
45 |
+
<?php endif?>
|
46 |
+
</td>
|
47 |
+
<td <?php echo $this->getValueProperties()?>>
|
48 |
+
<?php if ($_total->getStrong()):?>
|
49 |
+
<strong><?php echo $this->formatValue($_total) ?></strong>
|
50 |
+
<?php else:?>
|
51 |
+
<?php echo $this->formatValue($_total) ?>
|
52 |
+
<?php endif?>
|
53 |
+
</td>
|
54 |
+
</tr>
|
55 |
+
<?php endif?>
|
56 |
+
<?php else: ?>
|
57 |
+
<?php
|
58 |
+
|
59 |
+
//$_grand_total_p = Mage::getModel('directory/currency')->format($_total->getValue(),array('display'=>Zend_Currency::NO_SYMBOL), false);
|
60 |
+
|
61 |
+
$_grand_total_p = $_total->getValue(); ?>
|
62 |
+
<?php endif?>
|
63 |
+
<?php endforeach?>
|
64 |
+
|
65 |
+
<?php
|
66 |
+
$_orderDat = $this->getOrder();
|
67 |
+
|
68 |
+
$ek = "";
|
69 |
+
|
70 |
+
if($_orderDat->getPayment()->getCcType() == 'VI') {
|
71 |
+
$ek = "*";
|
72 |
+
}
|
73 |
+
|
74 |
+
$_fx_str = 'FX Rate'.$ek.': '.'1 USD = '.number_format($_orderDat->getPayment()->getIpayExchangeRate(), 4);
|
75 |
+
$_total_trans_str = 'Total in Transaction Currency '.$_grand_total_p.' '.$_orderDat->getPayment()->getIpayCurrencyCode();
|
76 |
+
|
77 |
+
|
78 |
+
?>
|
79 |
+
|
80 |
+
<tr>
|
81 |
+
<td colspan="4" align="right" style="padding: 10px 9px 3px; text-align: right;"><?php echo $_fx_str; ?></td>
|
82 |
+
</tr>
|
83 |
+
<tr>
|
84 |
+
<td colspan="4" align="right" style="padding: 3px 9px; text-align: right;"><?php echo $_total_trans_str; ?></td>
|
85 |
+
</tr>
|
app/locale/en_US/template/email/sales/ipay/order_new.html
ADDED
@@ -0,0 +1,109 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<!--@subject {{var store.getFrontendName()}}: New Order # {{var order.increment_id}} @-->
|
2 |
+
<!--@vars
|
3 |
+
{"store url=\"\"":"Store Url",
|
4 |
+
"var logo_url":"Email Logo Image Url",
|
5 |
+
"var logo_alt":"Email Logo Image Alt",
|
6 |
+
"htmlescape var=$order.getCustomerName()":"Customer Name",
|
7 |
+
"var store.getFrontendName()":"Store Name",
|
8 |
+
"store url=\"customer/account/\"":"Customer Account Url",
|
9 |
+
"var order.increment_id":"Order Id",
|
10 |
+
"var order.getCreatedAtFormated('long')":"Order Created At (datetime)",
|
11 |
+
"var order.getBillingAddress().format('html')":"Billing Address",
|
12 |
+
"var payment_html":"Payment Details",
|
13 |
+
"var order.getShippingAddress().format('html')":"Shipping Address",
|
14 |
+
"var order.getShippingDescription()":"Shipping Description",
|
15 |
+
"layout handle=\"sales_email_order_items\" order=$order":"Order Items Grid",
|
16 |
+
"var order.getEmailCustomerNote()":"Email Order Note"}
|
17 |
+
@-->
|
18 |
+
<!--@styles
|
19 |
+
body,td { color:#2f2f2f; font:11px/1.35em Verdana, Arial, Helvetica, sans-serif; }
|
20 |
+
@-->
|
21 |
+
|
22 |
+
<body style="background:#F6F6F6; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; margin:0; padding:0;">
|
23 |
+
<div style="background:#F6F6F6; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; margin:0; padding:0;">
|
24 |
+
<table cellspacing="0" cellpadding="0" border="0" width="100%">
|
25 |
+
<tr>
|
26 |
+
<td align="center" valign="top" style="padding:20px 0 20px 0">
|
27 |
+
<table bgcolor="#FFFFFF" cellspacing="0" cellpadding="10" border="0" width="650" style="border:1px solid #E0E0E0;">
|
28 |
+
<!-- [ header starts here] -->
|
29 |
+
<tr>
|
30 |
+
<td valign="top"><a href="{{store url=""}}"><img src="{{var logo_url}}" alt="{{var logo_alt}}" style="margin-bottom:10px;" border="0"/></a></td>
|
31 |
+
</tr>
|
32 |
+
<!-- [ middle starts here] -->
|
33 |
+
<tr>
|
34 |
+
<td valign="top">
|
35 |
+
<h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;"">Hello, {{htmlescape var=$order.getCustomerName()}}</h1>
|
36 |
+
<p style="font-size:12px; line-height:16px; margin:0;">
|
37 |
+
Thank you for your order from {{var store.getFrontendName()}}.
|
38 |
+
Once your package ships we will send an email with a link to track your order.
|
39 |
+
You can check the status of your order by <a href="{{store url="customer/account/"}}" style="color:#1E7EC8;">logging into your account</a>.
|
40 |
+
If you have any questions about your order please contact us at <a href="mailto:{{config path='trans_email/ident_support/email'}}" style="color:#1E7EC8;">{{config path='trans_email/ident_support/email'}}</a> or call us at <span class="nobr">{{config path='general/store_information/phone'}}</span> Monday - Friday, 8am - 5pm PST.
|
41 |
+
</p>
|
42 |
+
<p style="font-size:12px; line-height:16px; margin:0;">Your order confirmation is below. Thank you again for your business.</p>
|
43 |
+
</tr>
|
44 |
+
<tr>
|
45 |
+
<td>
|
46 |
+
<h2 style="font-size:18px; font-weight:normal; margin:0;">Your Order #{{var order.increment_id}} <small>(placed on {{var order.getCreatedAtFormated('long')}})</small></h2>
|
47 |
+
</td>
|
48 |
+
</tr>
|
49 |
+
<tr>
|
50 |
+
<td>
|
51 |
+
<table cellspacing="0" cellpadding="0" border="0" width="650">
|
52 |
+
<thead>
|
53 |
+
<tr>
|
54 |
+
<th align="left" width="325" bgcolor="#EAEAEA" style="font-size:13px; padding:5px 9px 6px 9px; line-height:1em;">Billing Information:</th>
|
55 |
+
<th width="10"></th>
|
56 |
+
<th align="left" width="325" bgcolor="#EAEAEA" style="font-size:13px; padding:5px 9px 6px 9px; line-height:1em;">Payment Method:</th>
|
57 |
+
</tr>
|
58 |
+
</thead>
|
59 |
+
<tbody>
|
60 |
+
<tr>
|
61 |
+
<td valign="top" style="font-size:12px; padding:7px 9px 9px 9px; border-left:1px solid #EAEAEA; border-bottom:1px solid #EAEAEA; border-right:1px solid #EAEAEA;">
|
62 |
+
{{var order.getBillingAddress().format('html')}}
|
63 |
+
</td>
|
64 |
+
<td> </td>
|
65 |
+
<td valign="top" style="font-size:12px; padding:7px 9px 9px 9px; border-left:1px solid #EAEAEA; border-bottom:1px solid #EAEAEA; border-right:1px solid #EAEAEA;">
|
66 |
+
{{var payment_html}}
|
67 |
+
</td>
|
68 |
+
</tr>
|
69 |
+
</tbody>
|
70 |
+
</table>
|
71 |
+
<br/>
|
72 |
+
{{depend order.getIsNotVirtual()}}
|
73 |
+
<table cellspacing="0" cellpadding="0" border="0" width="650">
|
74 |
+
<thead>
|
75 |
+
<tr>
|
76 |
+
<th align="left" width="325" bgcolor="#EAEAEA" style="font-size:13px; padding:5px 9px 6px 9px; line-height:1em;">Shipping Information:</th>
|
77 |
+
<th width="10"></th>
|
78 |
+
<th align="left" width="325" bgcolor="#EAEAEA" style="font-size:13px; padding:5px 9px 6px 9px; line-height:1em;">Shipping Method:</th>
|
79 |
+
</tr>
|
80 |
+
</thead>
|
81 |
+
<tbody>
|
82 |
+
<tr>
|
83 |
+
<td valign="top" style="font-size:12px; padding:7px 9px 9px 9px; border-left:1px solid #EAEAEA; border-bottom:1px solid #EAEAEA; border-right:1px solid #EAEAEA;">
|
84 |
+
{{var order.getShippingAddress().format('html')}}
|
85 |
+
|
86 |
+
</td>
|
87 |
+
<td> </td>
|
88 |
+
<td valign="top" style="font-size:12px; padding:7px 9px 9px 9px; border-left:1px solid #EAEAEA; border-bottom:1px solid #EAEAEA; border-right:1px solid #EAEAEA;">
|
89 |
+
{{var order.getShippingDescription()}}
|
90 |
+
|
91 |
+
</td>
|
92 |
+
</tr>
|
93 |
+
</tbody>
|
94 |
+
</table>
|
95 |
+
<br/>
|
96 |
+
{{/depend}}
|
97 |
+
{{layout handle="sales_email_order_items" order=$order}}
|
98 |
+
<p style="font-size:12px; margin:0 0 10px 0">{{var order.getEmailCustomerNote()}}</p>
|
99 |
+
</td>
|
100 |
+
</tr>
|
101 |
+
<tr>
|
102 |
+
{{block type='core/template' area='frontend' template='ipay/email/order/ipay_custom.phtml' order=$order}}
|
103 |
+
</tr>
|
104 |
+
</table>
|
105 |
+
</td>
|
106 |
+
</tr>
|
107 |
+
</table>
|
108 |
+
</div>
|
109 |
+
</body>
|
app/locale/en_US/template/email/sales/ipay/order_new_guest.html
ADDED
@@ -0,0 +1,108 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<!--@subject {{var store.getFrontendName()}}: New Order # {{var order.increment_id}} @-->
|
2 |
+
<!--@vars
|
3 |
+
{"store url=\"\"":"Store Url",
|
4 |
+
"var logo_url":"Email Logo Image Url",
|
5 |
+
"var logo_alt":"Email Logo Image Alt",
|
6 |
+
"htmlescape var=$order.getBillingAddress().getName()":"Guest Customer Name",
|
7 |
+
"var store.getFrontendName()":"Store Name",
|
8 |
+
"var order.increment_id":"Order Id",
|
9 |
+
"var order.getCreatedAtFormated('long')":"Order Created At (datetime)",
|
10 |
+
"var order.getBillingAddress().format('html')":"Billing Address",
|
11 |
+
"var payment_html":"Payment Details",
|
12 |
+
"var order.getShippingAddress().format('html')":"Shipping Address",
|
13 |
+
"var order.getShippingDescription()":"Shipping Description",
|
14 |
+
"layout handle=\"sales_email_order_items\" order=$order":"Order Items Grid",
|
15 |
+
"var order.getEmailCustomerNote()":"Email Order Note"}
|
16 |
+
@-->
|
17 |
+
<!--@styles
|
18 |
+
body,td { color:#2f2f2f; font:11px/1.35em Verdana, Arial, Helvetica, sans-serif; }
|
19 |
+
@-->
|
20 |
+
|
21 |
+
<body style="background:#F6F6F6; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; margin:0; padding:0;">
|
22 |
+
<div style="background:#F6F6F6; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; margin:0; padding:0;">
|
23 |
+
<table cellspacing="0" cellpadding="0" border="0" width="100%">
|
24 |
+
<tr>
|
25 |
+
<td align="center" valign="top" style="padding:20px 0 20px 0">
|
26 |
+
<!-- [ header starts here] -->
|
27 |
+
<table bgcolor="#FFFFFF" cellspacing="0" cellpadding="10" border="0" width="650" style="border:1px solid #E0E0E0;">
|
28 |
+
<tr>
|
29 |
+
<td valign="top"><a href="{{store url=""}}"><img src="{{var logo_url}}" alt="{{var logo_alt}}" style="margin-bottom:10px;" border="0"/></a></td>
|
30 |
+
</tr>
|
31 |
+
<!-- [ middle starts here] -->
|
32 |
+
<tr>
|
33 |
+
<td valign="top">
|
34 |
+
<h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;">Hello, {{htmlescape var=$order.getBillingAddress().getName()}}</h1>
|
35 |
+
<p style="font-size:12px; line-height:16px; margin:0 0 10px 0;">
|
36 |
+
Thank you for your order from {{var store.getFrontendName()}}.
|
37 |
+
Once your package ships we will send an email with a link to track your order.
|
38 |
+
If you have any questions about your order please contact us at <a href="mailto:{{config path='trans_email/ident_support/email'}}" style="color:#1E7EC8;">{{config path='trans_email/ident_support/email'}}</a> or call us at <span class="nobr">{{config path='general/store_information/phone'}}</span> Monday - Friday, 8am - 5pm PST.
|
39 |
+
</p>
|
40 |
+
<p style="font-size:12px; line-height:16px; margin:0;">Your order confirmation is below. Thank you again for your business.</p>
|
41 |
+
</td>
|
42 |
+
</tr>
|
43 |
+
<tr>
|
44 |
+
<td>
|
45 |
+
<h2 style="font-size:18px; font-weight:normal; margin:0;">Your Order #{{var order.increment_id}} <small>(placed on {{var order.getCreatedAtFormated('long')}})</small></h2>
|
46 |
+
</td>
|
47 |
+
</tr>
|
48 |
+
<tr>
|
49 |
+
<td>
|
50 |
+
<table cellspacing="0" cellpadding="0" border="0" width="650">
|
51 |
+
<thead>
|
52 |
+
<tr>
|
53 |
+
<th align="left" width="325" bgcolor="#EAEAEA" style="font-size:13px; padding:5px 9px 6px 9px; line-height:1em;">Billing Information:</th>
|
54 |
+
<th width="10"></th>
|
55 |
+
<th align="left" width="325" bgcolor="#EAEAEA" style="font-size:13px; padding:5px 9px 6px 9px; line-height:1em;">Payment Method:</th>
|
56 |
+
</tr>
|
57 |
+
</thead>
|
58 |
+
<tbody>
|
59 |
+
<tr>
|
60 |
+
<td valign="top" style="font-size:12px; padding:7px 9px 9px 9px; border-left:1px solid #EAEAEA; border-bottom:1px solid #EAEAEA; border-right:1px solid #EAEAEA;">
|
61 |
+
{{var order.getBillingAddress().format('html')}}
|
62 |
+
</td>
|
63 |
+
<td> </td>
|
64 |
+
<td valign="top" style="font-size:12px; padding:7px 9px 9px 9px; border-left:1px solid #EAEAEA; border-bottom:1px solid #EAEAEA; border-right:1px solid #EAEAEA;">
|
65 |
+
{{var payment_html}}
|
66 |
+
</td>
|
67 |
+
</tr>
|
68 |
+
</tbody>
|
69 |
+
</table>
|
70 |
+
<br/>
|
71 |
+
{{depend order.getIsNotVirtual()}}
|
72 |
+
<table cellspacing="0" cellpadding="0" border="0" width="100%">
|
73 |
+
<thead>
|
74 |
+
<tr>
|
75 |
+
<th align="left" width="325" bgcolor="#EAEAEA" style="font-size:13px; padding:5px 9px 6px 9px; line-height:1em;">Shipping Information:</th>
|
76 |
+
<th width="10"></th>
|
77 |
+
<th align="left" width="325" bgcolor="#EAEAEA" style="font-size:13px; padding:5px 9px 6px 9px; line-height:1em;">Shipping Method:</th>
|
78 |
+
</tr>
|
79 |
+
</thead>
|
80 |
+
<tbody>
|
81 |
+
<tr>
|
82 |
+
<td valign="top" style="font-size:12px; padding:7px 9px 9px 9px; border-left:1px solid #EAEAEA; border-bottom:1px solid #EAEAEA; border-right:1px solid #EAEAEA;">
|
83 |
+
{{var order.getShippingAddress().format('html')}}
|
84 |
+
|
85 |
+
</td>
|
86 |
+
<td> </td>
|
87 |
+
<td valign="top" style="font-size:12px; padding:7px 9px 9px 9px; border-left:1px solid #EAEAEA; border-bottom:1px solid #EAEAEA; border-right:1px solid #EAEAEA;">
|
88 |
+
{{var order.getShippingDescription()}}
|
89 |
+
|
90 |
+
</td>
|
91 |
+
</tr>
|
92 |
+
</tbody>
|
93 |
+
</table>
|
94 |
+
<br/>
|
95 |
+
{{/depend}}
|
96 |
+
{{layout handle="sales_email_order_items" order=$order}}
|
97 |
+
<p style="font-size:12px; margin:0 10px 10px 0">{{var order.getEmailCustomerNote()}}</p>
|
98 |
+
</td>
|
99 |
+
</tr>
|
100 |
+
<tr>
|
101 |
+
{{block type='core/template' area='frontend' template='ipay/email/order/ipay_custom.phtml' order=$order}}
|
102 |
+
</tr>
|
103 |
+
</table>
|
104 |
+
</td>
|
105 |
+
</tr>
|
106 |
+
</table>
|
107 |
+
</div>
|
108 |
+
</body>
|
package.xml
CHANGED
@@ -1,18 +1,19 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>planetpay_ipaygateway</name>
|
4 |
-
<version>1.0.
|
5 |
<stability>stable</stability>
|
6 |
-
<license
|
7 |
<channel>community</channel>
|
8 |
<extends/>
|
9 |
<summary>Magento Payment Method and Currency Conversion extension to use service provided by Planet Payment.</summary>
|
10 |
-
<description>This extension connects Magento with Planet Payment's services for credit card authorization, capture, and tokenization as well as currency conversion. These services work in conjunction with the Planet Payment Pay In Your Own Currency offering
|
11 |
-
|
|
|
12 |
<authors><author><name>Brad Seeley</name><user>Planet_Payment</user><email>bseeley@planetpayment.com</email></author></authors>
|
13 |
-
<date>
|
14 |
-
<time>
|
15 |
-
<contents><target name="magecommunity"><dir name="PlanetPayment"><dir name="IpayGateway"><dir name="Block"><dir name="Adminhtml"><dir name="Checkout"><file name="Ipay.php" hash="182c17e0d5e09414d3cf27376589b7ab"/></dir><dir name="Customer"><dir name="Edit"><dir name="Tab"><file name="Ipay.php" hash="956b006975c076cb2081f0752c8ec399"/></dir><file name="Tabs.php" hash="78aaf15df7948911e0a9431559d32cb0"/></dir></dir><dir name="Payment"><file name="Form.php" hash="dbf9dd9bebd9f66f664d98b63899fa95"/></dir><dir name="System"><dir name="Config"><file name="Export.php" hash="ddde70d886ea489ef912320ea294ee09"/><file name="Purge.php" hash="1b99e08eb0b8bbc953a97e21f984c202"/><file name="Test.php" hash="682ca2dbda014b99c63a3f1a110e14f1"/></dir></dir></dir><dir name="Checkout"><dir name="Cart"><file name="Totals.php" hash="b866dc528f5f3c658ffa0d7d9c6f6207"/></dir></dir><dir name="Onepage"><file name="Ipay.php" hash="022b9028c7d9dcdc9dfa7fd98f40e9f6"/></dir><file name="Onepage.php" hash="78f28311bd320c5ee380c1acedff59b8"/><dir name="Payment"><file name="Form.php" hash="3f59b6e03ef0b15ee9fb8884315937ef"/><file name="Info.php" hash="eb7656f7be047200aebb3f4041e5faaf"/></dir><dir name="Profile"><file name="Edit.php" hash="38a4a49c65c3b745429264451a7635c9"/><file name="List.php" hash="5c8dc5c49692aa3ad89efb416d3a4178"/></dir><file name="Profile.php" hash="c133c7d0a209a43157036039ba651ea6"/><dir name="Sales"><dir name="Order"><file name="Totals.php" hash="
|
16 |
<compatible/>
|
17 |
-
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php
|
18 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>planetpay_ipaygateway</name>
|
4 |
+
<version>1.0.8</version>
|
5 |
<stability>stable</stability>
|
6 |
+
<license>Open Software License v. 3.0 (OSL-3.0)</license>
|
7 |
<channel>community</channel>
|
8 |
<extends/>
|
9 |
<summary>Magento Payment Method and Currency Conversion extension to use service provided by Planet Payment.</summary>
|
10 |
+
<description>This extension connects Magento with Planet Payment's services for credit card authorization, capture, and tokenization as well as currency conversion. These services work in conjunction with the Planet Payment Pay In Your Own Currency offering.</description>
|
11 |
+
<notes>Added additional user data(Customer ip, Order id,Magento and extension version) to each transaction request XML.</description>
|
12 |
+
<notes>Added some additional user data(Customer IP,Order ID, Magento and Extension version ) to each transaction request XML</notes>
|
13 |
<authors><author><name>Brad Seeley</name><user>Planet_Payment</user><email>bseeley@planetpayment.com</email></author></authors>
|
14 |
+
<date>2014-01-30</date>
|
15 |
+
<time>13:41:09</time>
|
16 |
+
<contents><target name="mageetc"><dir name="modules"><file name="PlanetPayment_IpayGateway.xml" hash="5cd7961acfa1306ae6fb5857c0ec3bdd"/></dir></target><target name="magecommunity"><dir name="PlanetPayment"><dir name="IpayGateway"><dir name="Block"><dir name="Adminhtml"><dir name="Checkout"><file name="Ipay.php" hash="182c17e0d5e09414d3cf27376589b7ab"/></dir><dir name="Customer"><dir name="Edit"><dir name="Tab"><file name="Ipay.php" hash="956b006975c076cb2081f0752c8ec399"/></dir><file name="Tabs.php" hash="78aaf15df7948911e0a9431559d32cb0"/></dir></dir><dir name="Payment"><file name="Form.php" hash="dbf9dd9bebd9f66f664d98b63899fa95"/><dir name="_notes"><file name="dwsync.xml" hash="4bbbd8892e21821fb5e9761b636f3791"/></dir></dir><dir name="System"><dir name="Config"><file name="Export.php" hash="ddde70d886ea489ef912320ea294ee09"/><file name="Purge.php" hash="1b99e08eb0b8bbc953a97e21f984c202"/><file name="Test.php" hash="682ca2dbda014b99c63a3f1a110e14f1"/><dir name="_notes"><file name="dwsync.xml" hash="521b9ef04e909833717fc9b1accb5b17"/></dir></dir></dir></dir><dir name="Checkout"><dir name="Cart"><file name="Totals.php" hash="b866dc528f5f3c658ffa0d7d9c6f6207"/></dir></dir><dir name="Onepage"><file name="Ipay.php" hash="022b9028c7d9dcdc9dfa7fd98f40e9f6"/><dir name="_notes"><file name="dwsync.xml" hash="224d497311612bc5835cc212742cc4c9"/></dir></dir><file name="Onepage.php" hash="78f28311bd320c5ee380c1acedff59b8"/><dir name="Payment"><file name="Form.php" hash="3f59b6e03ef0b15ee9fb8884315937ef"/><file name="Info.php" hash="eb7656f7be047200aebb3f4041e5faaf"/></dir><dir name="Profile"><file name="Edit.php" hash="38a4a49c65c3b745429264451a7635c9"/><file name="List.php" hash="5c8dc5c49692aa3ad89efb416d3a4178"/><dir name="_notes"><file name="dwsync.xml" hash="f2051250e977e34f8ced1bb4c60bd019"/></dir></dir><file name="Profile.php" hash="c133c7d0a209a43157036039ba651ea6"/><dir name="Sales"><dir name="Order"><file name="Totals.php" hash="39a82b2b42bece907bc43649e82b7280"/><dir name="_notes"><file name="dwsync.xml" hash="e721864111610df1574d6245e18414fc"/></dir></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="eaf6d87444ff75f0165a388fa0e1ff31"/><file name="Error.php" hash="bd89f38d7c0f40b9e5535ecbb43517a8"/></dir><dir name="Model"><dir name="Currency"><dir name="Import"><file name="Ipay.php" hash="7e0d6d080b5edcee3a859ce12e49fbce"/></dir></dir><file name="CurrencyCode.php" hash="be0b3c08579dbc12b8151bee2606701a"/><file name="Ipay.php" hash="6ea5b119101c0fd786e74711307af417"/><file name="Log.php" hash="82988227a911bb94cd588b09b730f2c8"/><dir name="Observer"><file name="Abstract.php" hash="0b5664ea3ea368c765f96e48685293b4"/><file name="Checkout.php" hash="36b9158c4926dcf80046d3f3b0e95167"/><file name="Log.php" hash="593b418cb3b809912f704147c1f25764"/><dir name="_notes"><file name="dwsync.xml" hash="81c37e921774711d3e908e0989ca6327"/></dir></dir><file name="Profile.php" hash="441a84fa0a8f5fabd5880b8f65301eb0"/><dir name="Resource"><dir name="CurrencyCode"><file name="Collection.php" hash="e9b7479f9861f7aa174d285f18ac61eb"/></dir><file name="CurrencyCode.php" hash="646ddf0e769a7b147d28314c832b478f"/><dir name="Log"><file name="Collection.php" hash="32a4ba8f218fc8d9f687b17b583c24ca"/></dir><file name="Log.php" hash="0059c5c9aa3e4461d02bf0bbf84d15b9"/><dir name="Profile"><file name="Collection.php" hash="d7d48eaddd9d7b6c628003676be5803a"/></dir><file name="Profile.php" hash="879fc6ab6e9129f2cd6fd820c1fef5ce"/></dir><dir name="System"><dir name="Config"><dir name="General"><file name="Encryption.php" hash="7984d196b3df8b6282e268df1016b1ed"/><file name="Mode.php" hash="db81d615ece105a7c563db50c8fd0904"/></dir><dir name="Payment"><file name="Cctype.php" hash="8f1058b3773e1ad28543f59d060ae896"/><file name="Currency.php" hash="0e2c8da05e96be6e47eed02703c1b0b2"/><file name="PaymentAction.php" hash="9f1a3a23f652ed719d3c44e32c8bce69"/><file name="Service.php" hash="5185f6f870978c3e49ead5a0226db564"/><dir name="_notes"><file name="dwsync.xml" hash="247463ad6c606f44da3457427d35c788"/></dir></dir></dir></dir><dir name="Type"><file name="Onepage.php" hash="4f4fa44c01a3001a110acac9f1bb8e65"/></dir><dir name="Xml"><file name="Abstract.php" hash="8fb9dee63f8d79461daf9b72466466e1"/><file name="Request.php" hash="03e00d9233a6ff0c56f96266e94d6824"/><file name="Response.php" hash="2c5bfe9dcf86c86f882c2ff6d473e58e"/></dir></dir><dir name="controllers"><dir name="Adminhtml"><file name="CheckoutController.php" hash="07d4f69bf5b076303812419386cb1a0b"/><file name="CustomerController.php" hash="0eea07ffbe04f45106ae13f22fc19107"/><file name="SystemController.php" hash="7542ac227ed6f2782351af1fdbff1e5c"/></dir><file name="OnepageController.php" hash="c6b0ef2ced3d1e02b892272867706051"/><file name="ProfileController.php" hash="228ab8a66766b16b3c4fcaf0de669139"/></dir><dir name="data"><dir name="ipay_setup"><file name="data-install-1.0.0.php" hash="7dbf220ae77fc5daef6c90b5582a2be9"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="3400db9ec7a24b043b56d7a543ddeb8d"/><file name="config.xml" hash="008bd3d7e58d5e1431b120d6d2a7b95d"/><file name="system.xml" hash="8cf956dd5409f3553e26c4b7d7ae4f6e"/></dir><dir name="sql"><dir name="ipay_setup"><file name="install-1.0.0.php" hash="1fe6875dca481be13d6f41659b74361f"/><file name="mysql4-upgrade-1.0.0-1.0.1.php" hash="da400c195dcf3de0c9350fcb9c702c82"/><file name="mysql4-upgrade-1.0.1-1.0.2.php" hash="7a3f1dbce51e22406a5d14b5dc15491a"/><file name="mysql4-upgrade-1.0.2-1.0.5.php" hash="9c7f23c309223b49c6ec94aadb814c69"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="ipay.xml" hash="7cc8bb7b73bb991486506173362bf3b7"/></dir><dir name="template"><dir name="ipay"><dir name="checkout"><file name="currency_selector.phtml" hash="ff26d9cf9d30e1e067c3f1694c0e8406"/></dir><dir name="customer"><dir name="tab"><file name="ipay.phtml" hash="6fcf00a1f2c8d2c558df47e523f6e70a"/></dir></dir><dir name="payment"><file name="form.phtml" hash="dfbc4f7a4974bcdea1df0451d46be9f3"/><file name="info.phtml" hash="f35c97559c914938a6346ab9d6b10157"/></dir><dir name="system"><dir name="config"><file name="export.phtml" hash="bf1d91b675c4b0373031319b33e7ff61"/><file name="purge.phtml" hash="27229f19017c26cae2b7b31e78217ded"/><file name="test.phtml" hash="afe3c4c241d731ef1f0e7c095ec47848"/></dir></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="ipay.xml" hash="82ca97eeecdef3470474e6e4e4e09108"/></dir><dir name="template"><dir name="ipay"><dir name="checkout"><dir name="onepage"><file name="currency_selector.phtml" hash="687c6584b51608fed2dc7dce8b865501"/></dir></dir><dir name="email"><dir name="order"><file name="ipay_custom.phtml" hash="33481ddfc257f048b4c208bb3ca441d8"/></dir></dir><dir name="payment"><file name="form.phtml" hash="d9ff34b69b6494a1bd8201a8590c05f1"/><file name="info.phtml" hash="2709ff680077b76063d0d9ccc6071d05"/></dir><dir name="profile"><file name="edit.phtml" hash="db5e50dc2b954ed0f99d2c1430c5b992"/><file name="list.phtml" hash="826df04a5ae8d130394821df29397c24"/></dir><dir name="sales"><dir name="order"><file name="totals.phtml" hash="b1a652f1be8d797e981f90e35d3e5223"/></dir></dir></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="js"><dir name="ipay"><file name="ipay.js" hash="f565c7ae5dca369de75c3780a7920800"/></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="js"><dir name="ipay"><dir name="_notes"><file name="dwsync.xml" hash="6bb4cf8b8eed0909a592cf7eb9f7cf2d"/></dir><file name="validation.js" hash="3807a0a3cccb159013a690697c107f08"/></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="en_US"><dir name="template"><dir name="email"><dir name="sales"><dir name="ipay"><file name="order_new.html" hash="acabde15248b3a52a72e4c355de8a95f"/><file name="order_new_guest.html" hash="8701e05992ee90c5cc439825fe6534cd"/></dir></dir></dir></dir></dir></target></contents>
|
17 |
<compatible/>
|
18 |
+
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
|
19 |
</package>
|
skin/frontend/base/default/js/ipay/_notes/dwsync.xml
ADDED
@@ -0,0 +1,4 @@
|
|
|
|
|
|
|
|
|
1 |
+
<?xml version="1.0" encoding="utf-8" ?>
|
2 |
+
<dwsync>
|
3 |
+
<file name="validation.js" server="foreigncurrencypayments.com" local="130020691460000000" remote="130216229400000000" Dst="0" />
|
4 |
+
</dwsync>
|