CDev_XPaymentsConnector - Version 1.4.9

Version Notes

Version number: 1.4.9

Download this release

Release Info

Developer Valerii Demidov
Extension CDev_XPaymentsConnector
Version 1.4.9
Comparing to
See all releases


Code changes from version 1.4.1 to 1.4.9

Files changed (21) hide show
  1. app/code/community/Cdev/XPaymentsConnector/Block/Customer/Cardadd.php +10 -1
  2. app/code/community/Cdev/XPaymentsConnector/Block/Customer/Usercards.php +8 -0
  3. app/code/community/Cdev/XPaymentsConnector/Block/Info/Prepaidpayments.php +22 -1
  4. app/code/community/Cdev/XPaymentsConnector/Block/Info/Savedcards.php +30 -0
  5. app/code/community/Cdev/XPaymentsConnector/Helper/Data.php +2 -1
  6. app/code/community/Cdev/XPaymentsConnector/Model/Observer.php +40 -1
  7. app/code/community/Cdev/XPaymentsConnector/Model/Payment/Cc.php +27 -10
  8. app/code/community/Cdev/XPaymentsConnector/Model/Payment/Recurring/Profile.php +10 -4
  9. app/code/community/Cdev/XPaymentsConnector/controllers/ProcessingController.php +54 -44
  10. app/code/community/Cdev/XPaymentsConnector/etc/config.xml +3 -2
  11. app/code/community/Cdev/XPaymentsConnector/etc/system.xml +5 -3
  12. app/design/frontend/default/default/template/xpaymentsconnector/customer/usercards/cardadd.phtml +1 -2
  13. app/design/frontend/default/default/template/xpaymentsconnector/customer/usercards/list.phtml +19 -19
  14. app/design/frontend/default/default/template/xpaymentsconnector/info/prepaidpayments.phtml +2 -4
  15. app/design/frontend/default/default/template/xpaymentsconnector/info/savedcards.phtml +5 -8
  16. app/design/frontend/rwd/default/template/xpaymentsconnector/customer/usercards/cardadd.phtml +1 -2
  17. app/design/frontend/rwd/default/template/xpaymentsconnector/customer/usercards/list.phtml +19 -19
  18. app/design/frontend/rwd/default/template/xpaymentsconnector/info/prepaidpayments.phtml +2 -4
  19. app/design/frontend/rwd/default/template/xpaymentsconnector/info/savedcards.phtml +5 -8
  20. js/xpayment/settings.css +0 -4
  21. package.xml +5 -5
app/code/community/Cdev/XPaymentsConnector/Block/Customer/Cardadd.php CHANGED
@@ -49,7 +49,7 @@ class Cdev_XPaymentsConnector_Block_Customer_Cardadd extends Mage_Core_Block_Tem
49
  $updateSendData = array();
50
 
51
  $updateSendData['returnUrl'] = Mage::getUrl('xpaymentsconnector/customer/cardadd', array('order_refid' => $refId,'_secure' => true));
52
- $updateSendData['callbackUrl'] = Mage::getUrl('xpaymentsconnector/customer/cardadd', array('order_refid' => $refId, '_secure' => true));
53
  $updateSendData['refId'] = $refId;
54
  $updateSendData['template'] = 'magento_iframe';
55
 
@@ -64,5 +64,14 @@ class Cdev_XPaymentsConnector_Block_Customer_Cardadd extends Mage_Core_Block_Tem
64
  return $iframeUrl;
65
  }
66
 
 
 
 
 
 
 
 
 
 
67
 
68
  }
49
  $updateSendData = array();
50
 
51
  $updateSendData['returnUrl'] = Mage::getUrl('xpaymentsconnector/customer/cardadd', array('order_refid' => $refId,'_secure' => true));
52
+ $updateSendData['callbackUrl'] = Mage::getUrl('xpaymentsconnector/processing/callback', array('order_refid' => $refId, '_secure' => true));
53
  $updateSendData['refId'] = $refId;
54
  $updateSendData['template'] = 'magento_iframe';
55
 
64
  return $iframeUrl;
65
  }
66
 
67
+ /**
68
+ * @return string (url)
69
+ */
70
+ public function getXpayUrl(){
71
+ $xpayUrlMas = parse_url(Mage::getModel('xpaymentsconnector/payment_cc')->getConfig('xpay_url'));
72
+ $xpayUrl = $xpayUrlMas["scheme"]."://".$xpayUrlMas["host"];
73
+ return $xpayUrl;
74
+ }
75
+
76
 
77
  }
app/code/community/Cdev/XPaymentsConnector/Block/Customer/Usercards.php CHANGED
@@ -101,4 +101,12 @@ class Cdev_XPaymentsConnector_Block_Customer_Usercards extends Mage_Core_Block_T
101
  return $this->getUrl('xpaymentsconnector/customer/cardadd');
102
  }
103
 
 
 
 
 
 
 
 
 
104
  }
101
  return $this->getUrl('xpaymentsconnector/customer/cardadd');
102
  }
103
 
104
+ /**
105
+ * @return array
106
+ */
107
+ public function getCardsUsageOptions(){
108
+ $cardUsageOptions = Mage::getModel("xpaymentsconnector/usercards")->getCardsUsageOptions();
109
+ return $cardUsageOptions;
110
+ }
111
+
112
  }
app/code/community/Cdev/XPaymentsConnector/Block/Info/Prepaidpayments.php CHANGED
@@ -23,7 +23,7 @@
23
  * "Prepaid Payments (X-Payments)" info block
24
  */
25
 
26
- class Cdev_XPaymentsConnector_Block_Info_Prepaidpayments extends Mage_Payment_Block_Info
27
  {
28
 
29
  protected function _construct()
@@ -31,6 +31,27 @@ class Cdev_XPaymentsConnector_Block_Info_Prepaidpayments extends Mage_Payment_B
31
  parent::_construct();
32
  $this->setTemplate('xpaymentsconnector/info/prepaidpayments.phtml');
33
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
34
  }
35
 
36
 
23
  * "Prepaid Payments (X-Payments)" info block
24
  */
25
 
26
+ class Cdev_XPaymentsConnector_Block_Info_Prepaidpayments extends Mage_Payment_Block_Info
27
  {
28
 
29
  protected function _construct()
31
  parent::_construct();
32
  $this->setTemplate('xpaymentsconnector/info/prepaidpayments.phtml');
33
  }
34
+
35
+ /**
36
+ * @return array
37
+ */
38
+ public function getCardData()
39
+ {
40
+ $admSession = Mage::getSingleton('adminhtml/session');
41
+ $xpPrepaidPaymentsCard = $admSession->getData('xp_prepaid_payments');
42
+ $cardData = Mage::getModel('xpaymentsconnector/usercards')->load($xpPrepaidPaymentsCard)->getData();
43
+
44
+ return $cardData;
45
+ }
46
+
47
+ /**
48
+ * @return array
49
+ */
50
+ public function getOrderCardData($orderId)
51
+ {
52
+ $orderCardData = unserialize(Mage::getModel('sales/order')->load($orderId)->getData("xp_card_data"));
53
+ return $orderCardData;
54
+ }
55
  }
56
 
57
 
app/code/community/Cdev/XPaymentsConnector/Block/Info/Savedcards.php CHANGED
@@ -31,4 +31,34 @@ class Cdev_XPaymentsConnector_Block_Info_Savedcards extends Mage_Payment_Block_I
31
  $this->setTemplate('xpaymentsconnector/info/savedcards.phtml');
32
  }
33
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
34
  }
31
  $this->setTemplate('xpaymentsconnector/info/savedcards.phtml');
32
  }
33
 
34
+ public function getAdminXpPaymentCard()
35
+ {
36
+ $admSession = Mage::getSingleton('adminhtml/session');
37
+ $adminhtmlPaymentCardNumber = $admSession->getData('xp_payment_card');
38
+
39
+ return $adminhtmlPaymentCardNumber;
40
+ }
41
+
42
+ public function getCardData($adminhtmlPaymentCardNumber = NULL)
43
+ {
44
+ $cardData = array();
45
+ $xpUserCardsModel = Mage::getModel('xpaymentsconnector/usercards');
46
+ if (is_null($adminhtmlPaymentCardNumber)) {
47
+ $quote = Mage::getSingleton('checkout/session')->getQuote();
48
+ $paymentCardNumber = $quote->getPayment()->getData('xp_payment_card');
49
+ $cardData = $xpUserCardsModel->load($paymentCardNumber)->getData();
50
+ } else {
51
+ $cardData = $xpUserCardsModel->load($adminhtmlPaymentCardNumber)->getData();
52
+ }
53
+
54
+ return $cardData;
55
+ }
56
+
57
+ public function getOrderCardData($orderId)
58
+ {
59
+ $orderCardData = unserialize(Mage::getModel('sales/order')->load($orderId)->getData('xp_card_data'));
60
+
61
+ return$orderCardData;
62
+ }
63
+
64
  }
app/code/community/Cdev/XPaymentsConnector/Helper/Data.php CHANGED
@@ -643,9 +643,10 @@ class Cdev_XPaymentsConnector_Helper_Data extends Mage_Payment_Helper_Data
643
  $card = Mage::getModel('xpaymentsconnector/usercards')->load($paymentCardNumber);
644
  $cardData = $card->getData();
645
  $this->resendPayDeferredRecurringTransaction($recurringProfile, $orderAmountData, $cardData);
 
 
646
  }
647
  $this->payDeferredProfileId = $recurringProfile->getProfileId();
648
- $recurringProfile->activate();
649
 
650
  return true;
651
  break;
643
  $card = Mage::getModel('xpaymentsconnector/usercards')->load($paymentCardNumber);
644
  $cardData = $card->getData();
645
  $this->resendPayDeferredRecurringTransaction($recurringProfile, $orderAmountData, $cardData);
646
+ } else {
647
+ $recurringProfile->activate();
648
  }
649
  $this->payDeferredProfileId = $recurringProfile->getProfileId();
 
650
 
651
  return true;
652
  break;
app/code/community/Cdev/XPaymentsConnector/Model/Observer.php CHANGED
@@ -486,7 +486,46 @@ class Cdev_XPaymentsConnector_Model_Observer extends Mage_CatalogInventory_Model
486
 
487
  //set recurring product discount
488
  Mage::helper('xpaymentsconnector')->setRecurringProductDiscount();
489
- //$xpHelper->updateAllRecurringQuoteItem();
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
490
  }
491
 
492
  /**
486
 
487
  //set recurring product discount
488
  Mage::helper('xpaymentsconnector')->setRecurringProductDiscount();
489
+
490
+ // update InitAmount for recurring products
491
+ $cart = $observer->getCart('quote');
492
+ foreach ($cart->getAllVisibleItems() as $item){
493
+ $product = $item->getProduct();
494
+ if ((bool)$product->getIsRecurring()) {
495
+ $profile = Mage::getModel('payment/recurring_profile')
496
+ ->setLocale(Mage::app()->getLocale())
497
+ ->setStore(Mage::app()->getStore())
498
+ ->importProduct($product);
499
+ if($profile->getInitAmount()){
500
+ // duplicate as 'additional_options' to render with the product statically
501
+ $infoOptions = array(array(
502
+ 'label' => $profile->getFieldLabel('start_datetime'),
503
+ 'value' => $profile->exportStartDatetime(true),
504
+ ));
505
+
506
+ foreach ($profile->exportScheduleInfo($item) as $info) {
507
+ $infoOptions[] = array(
508
+ 'label' => $info->getTitle(),
509
+ 'value' => $info->getSchedule(),
510
+ );
511
+ }
512
+
513
+ $itemOptionModel = Mage::getModel('sales/quote_item_option')
514
+ ->getCollection()
515
+ ->addItemFilter($item->getId())
516
+ ->addFieldToFilter('code','additional_options')
517
+ ->addFieldToFilter('product_id',$product->getId())
518
+ ->getFirstItem();
519
+
520
+ $itemOptionModel->setValue(serialize($infoOptions));
521
+ $itemOptionModel->save();
522
+ }
523
+ }
524
+
525
+
526
+ }
527
+ //
528
+
529
  }
530
 
531
  /**
app/code/community/Cdev/XPaymentsConnector/Model/Payment/Cc.php CHANGED
@@ -903,17 +903,29 @@ class Cdev_XPaymentsConnector_Model_Payment_Cc extends Mage_Payment_Model_Method
903
  protected function isForceAuth()
904
  {
905
  $xpHelper = Mage::helper('xpaymentsconnector');
906
- $isRecurrnigProduct = $xpHelper->checkIssetRecurringOrder();
907
- if ($isRecurrnigProduct['isset']) {
908
- $useStartDateParam = $xpHelper->checkStartDateData();
909
- if ($useStartDateParam['total_min_amount']) {
910
- $useInitialFeeAuthorize = Mage::getStoreConfig('payment/xpayments/use_initialfee_authorize');
911
- return (bool)$useInitialFeeAuthorize;
912
- }
 
 
 
913
  }
914
 
915
- $useAuthorize = Mage::getStoreConfig('payment/xpayments/use_authorize');
916
- return (bool)$useAuthorize;
 
 
 
 
 
 
 
 
 
917
  }
918
 
919
  /**
@@ -1792,7 +1804,12 @@ class Cdev_XPaymentsConnector_Model_Payment_Cc extends Mage_Payment_Model_Method
1792
  $order->setStatus(Mage_Sales_Model_Order::STATE_PROCESSING);
1793
  }
1794
  $order->save();
1795
- $order->sendNewOrderEmail();
 
 
 
 
 
1796
  }
1797
  $result['success'] = true;
1798
  return $result;
903
  protected function isForceAuth()
904
  {
905
  $xpHelper = Mage::helper('xpaymentsconnector');
906
+ $isRecurringProduct = $xpHelper->checkIssetRecurringOrder();
907
+
908
+ $request = Mage::app()->getRequest()->getActionName();
909
+ if($request == 'cardadd'){
910
+ return true;
911
+ };
912
+
913
+ if ($xpHelper->checkIssetSimpleOrder()) {
914
+ $useAuthorize = Mage::getStoreConfig('payment/xpayments/use_authorize');
915
+ return (bool)$useAuthorize;
916
  }
917
 
918
+ if ($isRecurringProduct['isset']) {
919
+ $currentProduct = $isRecurringProduct['quote_item']->getProduct();
920
+ $checkQuoteItemResult = $xpHelper->checkStartDateDataByProduct($currentProduct,$isRecurringProduct['quote_item']);
921
+ if ($checkQuoteItemResult[$currentProduct->getId()]['success']) {
922
+ if (!$isRecurringProduct['quote_item']->getXpRecurringInitialFee()) {
923
+ return true;
924
+ }
925
+ }
926
+ $useInitialFeeAuthorize = Mage::getStoreConfig('payment/xpayments/use_initialfee_authorize');
927
+ return (bool)$useInitialFeeAuthorize;
928
+ }
929
  }
930
 
931
  /**
1804
  $order->setStatus(Mage_Sales_Model_Order::STATE_PROCESSING);
1805
  }
1806
  $order->save();
1807
+ if(method_exists($order,'sendNewOrderEmail')){
1808
+ $order->sendNewOrderEmail();
1809
+ }elseif(method_exists($order,'queueNewOrderEmail')){
1810
+ $order->queueNewOrderEmail();
1811
+ }
1812
+
1813
  }
1814
  $result['success'] = true;
1815
  return $result;
app/code/community/Cdev/XPaymentsConnector/Model/Payment/Recurring/Profile.php CHANGED
@@ -31,15 +31,15 @@
31
  class Cdev_XPaymentsConnector_Model_Payment_Recurring_Profile extends Mage_Payment_Model_Recurring_Profile
32
  {
33
 
34
- public function exportScheduleInfo()
35
  {
36
  $result = array(
37
  new Varien_Object(array(
38
  'title' => Mage::helper('payment')->__('Billing Period'),
39
- 'schedule' => $this->_renderSchedule('period_unit', 'period_frequency', 'period_max_cycles',"init_amount"),
40
  ))
41
  );
42
- $trial = $this->_renderSchedule('trial_period_unit', 'trial_period_frequency', 'trial_period_max_cycles');
43
  if ($trial) {
44
  $result[] = new Varien_Object(array(
45
  'title' => Mage::helper('payment')->__('Trial Period'),
@@ -49,7 +49,7 @@ class Cdev_XPaymentsConnector_Model_Payment_Recurring_Profile extends Mage_Paym
49
  return $result;
50
  }
51
 
52
- protected function _renderSchedule($periodKey, $frequencyKey, $cyclesKey,$initKey = null)
53
  {
54
  $result = array();
55
 
@@ -73,6 +73,12 @@ class Cdev_XPaymentsConnector_Model_Payment_Recurring_Profile extends Mage_Paym
73
  }
74
  $init = $this->_getData($initKey);
75
  if($init){
 
 
 
 
 
 
76
  $result[] = Mage::helper('xpaymentsconnector')->__('Initial Fee %s.', Mage::helper('core')->currency($init,true,false));
77
  }
78
 
31
  class Cdev_XPaymentsConnector_Model_Payment_Recurring_Profile extends Mage_Payment_Model_Recurring_Profile
32
  {
33
 
34
+ public function exportScheduleInfo($quoteItem = null)
35
  {
36
  $result = array(
37
  new Varien_Object(array(
38
  'title' => Mage::helper('payment')->__('Billing Period'),
39
+ 'schedule' => $this->_renderSchedule('period_unit', 'period_frequency', 'period_max_cycles', "init_amount", $quoteItem),
40
  ))
41
  );
42
+ $trial = $this->_renderSchedule('trial_period_unit', 'trial_period_frequency', 'trial_period_max_cycles', $initKey = null, $quoteItem);
43
  if ($trial) {
44
  $result[] = new Varien_Object(array(
45
  'title' => Mage::helper('payment')->__('Trial Period'),
49
  return $result;
50
  }
51
 
52
+ protected function _renderSchedule($periodKey, $frequencyKey, $cyclesKey,$initKey = null, $quoteItem = null)
53
  {
54
  $result = array();
55
 
73
  }
74
  $init = $this->_getData($initKey);
75
  if($init){
76
+ $qty = Mage::app()->getRequest()->getParam('qty');
77
+ if (!is_null($quoteItem)) {
78
+ $init = $init * $quoteItem->getQty();
79
+ } elseif ($qty) {
80
+ $init = $init * $qty;
81
+ }
82
  $result[] = Mage::helper('xpaymentsconnector')->__('Initial Fee %s.', Mage::helper('core')->currency($init,true,false));
83
  }
84
 
app/code/community/Cdev/XPaymentsConnector/controllers/ProcessingController.php CHANGED
@@ -55,8 +55,8 @@ class Cdev_XPaymentsConnector_ProcessingController extends Mage_Core_Controller_
55
  * @see ____func_see____
56
  * @since 1.0.0
57
  */
58
- public function callbackAction(){
59
-
60
  // Check request type
61
 
62
  if (!$this->getRequest()->isPost()) {
@@ -68,6 +68,8 @@ class Cdev_XPaymentsConnector_ProcessingController extends Mage_Core_Controller_
68
  '/^.+$/Ss',
69
  explode(',', Mage::getStoreConfig('xpaymentsconnector/settings/xpay_allowed_ip_addresses'))
70
  );
 
 
71
  if ($ips) {
72
  $helper = Mage::helper('core/http');
73
  if (method_exists($helper, 'getRemoteAddr')) {
@@ -79,7 +81,7 @@ class Cdev_XPaymentsConnector_ProcessingController extends Mage_Core_Controller_
79
  }
80
 
81
  if (!in_array($remoteAddr, $ips)) {
82
- Mage::throwException('IP can\'t be validated as X-Payments server IP.');
83
  }
84
  }
85
 
@@ -98,12 +100,15 @@ class Cdev_XPaymentsConnector_ProcessingController extends Mage_Core_Controller_
98
  }
99
 
100
  // add request to log
101
- $api = Mage::getModel('xpaymentsconnector/payment_cc');
102
- if ($request['updateData']){
103
  $request['updateData'] = $api->decryptXML($request['updateData']);
104
  }
105
 
106
- $api->getAPIError(serialize($request));
 
 
 
 
107
 
108
  // Check order
109
  $order = Mage::getModel('sales/order')->loadByAttribute('xpc_txnid', $request['txnId']);
@@ -133,45 +138,50 @@ class Cdev_XPaymentsConnector_ProcessingController extends Mage_Core_Controller_
133
  $order->save();
134
  }
135
 
136
- } elseif (isset($request['updateData']['parentId'])) {
137
-
138
- $userCardModel = Mage::getModel('xpaymentsconnector/usercards');
139
- $userCardCollection = $userCardModel
140
- ->getCollection()
141
- ->addFieldToSelect('user_id')
142
- ->addFieldToSelect('last_4_cc_num')
143
- ->addFieldToSelect('card_type')
144
- ->addFilter('txnId', $request['updateData']['parentId']);
145
- if ($userCardCollection->getSize()) {
146
- $newPrepaidCard = $userCardCollection->getFirstItem()->getData();
147
- $newPrepaidCard['txnId'] = $request['txnId'];
148
- $newPrepaidCard['usage_type'] = Cdev_XPaymentsConnector_Model_Usercards::BALANCE_CARD;
149
- $newPrepaidCard['amount'] = $request['updateData']['amount'];
150
- $userCardModel->setData($newPrepaidCard);
151
- $userCardModel->save();
152
- } else {
153
- $order = Mage::getModel('sales/order')->loadByAttribute('xpc_txnid', $request['updateData']['parentId']);
154
- if ($order->getId()) {
155
- $newPrepaidCard = array();
156
- $newPrepaidCard['user_id'] = $order->getData('customer_id');
157
- $newPrepaidCard['txnId'] = $request['txnId'];
158
- $newPrepaidCard['usage_type'] = Cdev_XPaymentsConnector_Model_Usercards::BALANCE_CARD;
159
- $newPrepaidCard['amount'] = $request['updateData']['amount'];
160
-
161
- $parentXpaymentResponseData = unserialize($order->getData('xp_card_data'));
162
- $newPrepaidCard['last_4_cc_num'] = $parentXpaymentResponseData['last_4_cc_num'];
163
- $newPrepaidCard['card_type'] = $parentXpaymentResponseData['card_type'];
164
-
165
- $userCardModel->setData($newPrepaidCard);
166
- $userCardModel->save();
167
- } else {
168
-
169
- $errorMessage = "Unable to create 'prepaid cart' because there is no corresponding order with the number of tokens -".$request['txnId'];
170
- $api->getAPIError($errorMessage);
171
-
172
- }
173
- }
174
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
175
  exit(0);
176
  }
177
 
55
  * @see ____func_see____
56
  * @since 1.0.0
57
  */
58
+ public function callbackAction()
59
+ {
60
  // Check request type
61
 
62
  if (!$this->getRequest()->isPost()) {
68
  '/^.+$/Ss',
69
  explode(',', Mage::getStoreConfig('xpaymentsconnector/settings/xpay_allowed_ip_addresses'))
70
  );
71
+ $api = Mage::getModel('xpaymentsconnector/payment_cc');
72
+
73
  if ($ips) {
74
  $helper = Mage::helper('core/http');
75
  if (method_exists($helper, 'getRemoteAddr')) {
81
  }
82
 
83
  if (!in_array($remoteAddr, $ips)) {
84
+ $api->getApiError('IP can\'t be validated as X-Payments server IP.');
85
  }
86
  }
87
 
100
  }
101
 
102
  // add request to log
103
+ if ($request['updateData']) {
 
104
  $request['updateData'] = $api->decryptXML($request['updateData']);
105
  }
106
 
107
+ Mage::log(sprintf('X-Payment server response: %s', serialize($request)),
108
+ null,
109
+ $xpaymentsHelper::XPAYMENTS_LOG_FILE,
110
+ true);
111
+
112
 
113
  // Check order
114
  $order = Mage::getModel('sales/order')->loadByAttribute('xpc_txnid', $request['txnId']);
138
  $order->save();
139
  }
140
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
141
  }
142
+
143
+ //TODO: need process 'charge response' from 'x-payment server'
144
+ /*
145
+ elseif (isset($request['updateData']['parentId'])) {
146
+
147
+ $userCardModel = Mage::getModel('xpaymentsconnector/usercards');
148
+ $userCardCollection = $userCardModel
149
+ ->getCollection()
150
+ ->addFieldToSelect('user_id')
151
+ ->addFieldToSelect('last_4_cc_num')
152
+ ->addFieldToSelect('card_type')
153
+ ->addFilter('txnId', $request['updateData']['parentId']);
154
+ if ($userCardCollection->getSize()) {
155
+ $newPrepaidCard = $userCardCollection->getFirstItem()->getData();
156
+ $newPrepaidCard['txnId'] = $request['txnId'];
157
+ $newPrepaidCard['usage_type'] = Cdev_XPaymentsConnector_Model_Usercards::BALANCE_CARD;
158
+ $newPrepaidCard['amount'] = $request['updateData']['amount'];
159
+ $userCardModel->setData($newPrepaidCard);
160
+ $userCardModel->save();
161
+ } else {
162
+ $order = Mage::getModel('sales/order')->loadByAttribute('xpc_txnid', $request['updateData']['parentId']);
163
+ if ($order->getId()) {
164
+ $newPrepaidCard = array();
165
+ $newPrepaidCard['user_id'] = $order->getData('customer_id');
166
+ $newPrepaidCard['txnId'] = $request['txnId'];
167
+ $newPrepaidCard['usage_type'] = Cdev_XPaymentsConnector_Model_Usercards::BALANCE_CARD;
168
+ $newPrepaidCard['amount'] = $request['updateData']['amount'];
169
+
170
+ $parentXpaymentResponseData = unserialize($order->getData('xp_card_data'));
171
+ $newPrepaidCard['last_4_cc_num'] = $parentXpaymentResponseData['last_4_cc_num'];
172
+ $newPrepaidCard['card_type'] = $parentXpaymentResponseData['card_type'];
173
+
174
+ $userCardModel->setData($newPrepaidCard);
175
+ $userCardModel->save();
176
+ } else {
177
+
178
+ $errorMessage = "Unable to create 'prepaid cart' because there is no corresponding order with the number of tokens -".$request['txnId'];
179
+ $api->getAPIError($errorMessage);
180
+
181
+ }
182
+ }
183
+ }
184
+ */
185
  exit(0);
186
  }
187
 
app/code/community/Cdev/XPaymentsConnector/etc/config.xml CHANGED
@@ -420,13 +420,14 @@
420
  <allowspecific>0</allowspecific>
421
  <title>Use saved payment cards (X-Payments)</title>
422
  </savedcards>
423
- <prepaidpayments>
 
424
  <active>0</active>
425
  <model>xpaymentsconnector/payment_prepaidpayments</model>
426
  <order_status>1</order_status>
427
  <allowspecific>0</allowspecific>
428
  <title>Prepaid Payments (X-Payments)</title>
429
- </prepaidpayments>
430
  </payment>
431
  <xpaymentsconnector>
432
  <settings>
420
  <allowspecific>0</allowspecific>
421
  <title>Use saved payment cards (X-Payments)</title>
422
  </savedcards>
423
+ <!-- @TODO: need process 'charge response' from 'x-payment server' -->
424
+ <!--<prepaidpayments>
425
  <active>0</active>
426
  <model>xpaymentsconnector/payment_prepaidpayments</model>
427
  <order_status>1</order_status>
428
  <allowspecific>0</allowspecific>
429
  <title>Prepaid Payments (X-Payments)</title>
430
+ </prepaidpayments>-->
431
  </payment>
432
  <xpaymentsconnector>
433
  <settings>
app/code/community/Cdev/XPaymentsConnector/etc/system.xml CHANGED
@@ -105,6 +105,7 @@
105
  </placedisplay>
106
  <use_authorize translate="label">
107
  <label>Use forced Authorize operation</label>
 
108
  <frontend_type>select</frontend_type>
109
  <source_model>adminhtml/system_config_source_yesno</source_model>
110
  <sort_order>9</sort_order>
@@ -113,7 +114,7 @@
113
  <show_in_store>0</show_in_store>
114
  </use_authorize>
115
  <use_initialfee_authorize translate="label">
116
- <label>Use forced Authorize operation for initial fee</label>
117
  <frontend_type>select</frontend_type>
118
  <source_model>adminhtml/system_config_source_yesno</source_model>
119
  <sort_order>10</sort_order>
@@ -159,7 +160,8 @@
159
  </title>
160
  </fields>
161
  </savedcards>
162
- <prepaidpayments>
 
163
  <label>Prepaid Payments (X-Payments)</label>
164
  <frontend_type>text</frontend_type>
165
  <sort_order>201</sort_order>
@@ -193,7 +195,7 @@
193
  <show_in_store>0</show_in_store>
194
  </title>
195
  </fields>
196
- </prepaidpayments>
197
  </groups>
198
  </payment>
199
  <xpaymentsconnector translate="label" module="xpaymentsconnector">
105
  </placedisplay>
106
  <use_authorize translate="label">
107
  <label>Use forced Authorize operation</label>
108
+ <comment><![CDATA[Work only for non recurring product order.]]></comment>
109
  <frontend_type>select</frontend_type>
110
  <source_model>adminhtml/system_config_source_yesno</source_model>
111
  <sort_order>9</sort_order>
114
  <show_in_store>0</show_in_store>
115
  </use_authorize>
116
  <use_initialfee_authorize translate="label">
117
+ <label>Use forced Authorize operation for recurring products</label>
118
  <frontend_type>select</frontend_type>
119
  <source_model>adminhtml/system_config_source_yesno</source_model>
120
  <sort_order>10</sort_order>
160
  </title>
161
  </fields>
162
  </savedcards>
163
+ <!-- @TODO: need process 'charge response' from 'x-payment server' -->
164
+ <!--<prepaidpayments>
165
  <label>Prepaid Payments (X-Payments)</label>
166
  <frontend_type>text</frontend_type>
167
  <sort_order>201</sort_order>
195
  <show_in_store>0</show_in_store>
196
  </title>
197
  </fields>
198
+ </prepaidpayments>-->
199
  </groups>
200
  </payment>
201
  <xpaymentsconnector translate="label" module="xpaymentsconnector">
app/design/frontend/default/default/template/xpaymentsconnector/customer/usercards/cardadd.phtml CHANGED
@@ -25,8 +25,7 @@
25
  */
26
  ?>
27
  <?php
28
- $xpayUrlMas = parse_url(Mage::getModel('xpaymentsconnector/payment_cc')->getConfig('xpay_url'));
29
- $xpayUrl = $xpayUrlMas["scheme"]."://".$xpayUrlMas["host"];
30
  ?>
31
 
32
  <div class="page-title">
25
  */
26
  ?>
27
  <?php
28
+ $xpayUrl = $this->getXpayUrl();
 
29
  ?>
30
 
31
  <div class="page-title">
app/design/frontend/default/default/template/xpaymentsconnector/customer/usercards/list.phtml CHANGED
@@ -25,14 +25,14 @@
25
  */
26
  ?>
27
  <?php $_items = $this->getItems(); ?>
28
- <?php $cardUsageOptions = Mage::getModel("xpaymentsconnector/usercards")->getCardsUsageOptions();?>
29
  <div class="page-title">
30
- <h1><?php echo Mage::helper('xpaymentsconnector')->__('Edit payment cards list (X-Payments)') ?></h1>
31
  </div>
32
  <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
33
  <?php echo $this->getChildHtml('pager'); ?>
34
  <form id="credit-card-list-form" method="post" action="<?php echo Mage::getUrl("xpaymentsconnector/customer/usercards");?>">
35
- <?php if(count($_items)): ?>
36
  <table class="data-table" id="my-credit-cards-table">
37
  <col width="1" />
38
  <col width="1" />
@@ -42,12 +42,12 @@
42
  <thead>
43
  <tr>
44
  <th><a id="select-all-cards" href="#" onclick="addRelatedCard(event)">Select all</a>
45
- /
46
  <a id="unselect-all-cards" href="#" onclick="removeRelatedCard(event)">Unselect all</a></th>
47
- <th><?php echo Mage::helper('xpaymentsconnector')->__('Card id #') ?></th>
48
- <th><?php echo Mage::helper('xpaymentsconnector')->__('Card number') ?></th>
49
- <th><?php echo Mage::helper('xpaymentsconnector')->__('Card type') ?></th>
50
- <th><?php echo Mage::helper('xpaymentsconnector')->__('Usage card type'); ?></th>
51
  </tr>
52
  </thead>
53
  <tbody>
@@ -65,18 +65,18 @@
65
  </table>
66
  <input type="hidden" name="action" value="remove">
67
 
68
- <script type="text/javascript">decorateTable('my-credit-cards-table')</script>
69
- <?php else: ?>
70
- <p><?php echo Mage::helper('xpaymentsconnector')->__('You have no saved credit cards yet.'); ?></p>
71
- <?php endif; ?>
72
- <?php echo $this->getChildHtml('pager'); ?>
73
- <div class="buttons-set">
74
- <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
75
- <?php if(count($_items)): ?>
76
- <button class="button" title="Save" type="submit"><span><span>Remove</span></span></button>
77
  <?php endif; ?>
78
- <button onclick="window.location='<?php echo $this->getAddCardUrl();?>'" class="button" title="Add new card" type="button"><span><span>Add new card</span></span></button>
79
- </div>
 
 
 
 
 
 
80
  </form>
81
 
82
  <script type="text/javascript">
25
  */
26
  ?>
27
  <?php $_items = $this->getItems(); ?>
28
+ <?php $cardUsageOptions = $this->getCardsUsageOptions();?>
29
  <div class="page-title">
30
+ <h1><?php echo $this->__('Edit payment cards list (X-Payments)') ?></h1>
31
  </div>
32
  <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
33
  <?php echo $this->getChildHtml('pager'); ?>
34
  <form id="credit-card-list-form" method="post" action="<?php echo Mage::getUrl("xpaymentsconnector/customer/usercards");?>">
35
+ <?php if(count($_items)): ?>
36
  <table class="data-table" id="my-credit-cards-table">
37
  <col width="1" />
38
  <col width="1" />
42
  <thead>
43
  <tr>
44
  <th><a id="select-all-cards" href="#" onclick="addRelatedCard(event)">Select all</a>
45
+ /
46
  <a id="unselect-all-cards" href="#" onclick="removeRelatedCard(event)">Unselect all</a></th>
47
+ <th><?php echo $this->__('Card id #') ?></th>
48
+ <th><?php echo $this->__('Card number') ?></th>
49
+ <th><?php echo $this->__('Card type') ?></th>
50
+ <th><?php echo $this->__('Usage card type'); ?></th>
51
  </tr>
52
  </thead>
53
  <tbody>
65
  </table>
66
  <input type="hidden" name="action" value="remove">
67
 
68
+ <script type="text/javascript">decorateTable('my-credit-cards-table')</script>
69
+ <?php else: ?>
70
+ <p><?php echo $this->__('You have no saved credit cards yet.'); ?></p>
 
 
 
 
 
 
71
  <?php endif; ?>
72
+ <?php echo $this->getChildHtml('pager'); ?>
73
+ <div class="buttons-set">
74
+ <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
75
+ <?php if(count($_items)): ?>
76
+ <button class="button" title="Save" type="submit"><span><span>Remove</span></span></button>
77
+ <?php endif; ?>
78
+ <button onclick="window.location='<?php echo $this->getAddCardUrl();?>'" class="button" title="Add new card" type="button"><span><span>Add new card</span></span></button>
79
+ </div>
80
  </form>
81
 
82
  <script type="text/javascript">
app/design/frontend/default/default/template/xpaymentsconnector/info/prepaidpayments.phtml CHANGED
@@ -25,9 +25,7 @@
25
  */
26
  ?>
27
  <?php
28
- $admSession = Mage::getSingleton('adminhtml/session');
29
- $xpPrepaidPaymentsCard = $admSession->getData("xp_prepaid_payments");
30
- $cardData = Mage::getModel("xpaymentsconnector/usercards")->load($xpPrepaidPaymentsCard)->getData();
31
  ?>
32
  <?php echo $this->getMethod()->getTitle(); ?>
33
  <br />
@@ -36,7 +34,7 @@ $cardData = Mage::getModel("xpaymentsconnector/usercards")->load($xpPrepaidPayme
36
  <?php echo $this->__("For current order we charged funds from your payment card (**%s)",$cardData['last_4_cc_num']); ?>
37
  </span>
38
  <?php elseif ($orderId = $this->getRequest()->getParam("order_id")): ?>
39
- <?php $orderCardData = unserialize(Mage::getModel('sales/order')->load($orderId)->getData("xp_card_data")); ?>
40
  <span id="x-payment-prepaid-card-info">
41
  <?php echo $this->__("For current order we charged funds from your payment card (**%s)",$orderCardData['last_4_cc_num']); ?>
42
  </span>
25
  */
26
  ?>
27
  <?php
28
+ $cardData = $this->getCardData()
 
 
29
  ?>
30
  <?php echo $this->getMethod()->getTitle(); ?>
31
  <br />
34
  <?php echo $this->__("For current order we charged funds from your payment card (**%s)",$cardData['last_4_cc_num']); ?>
35
  </span>
36
  <?php elseif ($orderId = $this->getRequest()->getParam("order_id")): ?>
37
+ <?php $orderCardData = $this->getOrderCardData($orderId); ?>
38
  <span id="x-payment-prepaid-card-info">
39
  <?php echo $this->__("For current order we charged funds from your payment card (**%s)",$orderCardData['last_4_cc_num']); ?>
40
  </span>
app/design/frontend/default/default/template/xpaymentsconnector/info/savedcards.phtml CHANGED
@@ -25,11 +25,8 @@
25
  */
26
  ?>
27
  <?php
28
- $admSession = Mage::getSingleton('adminhtml/session');
29
- $adminhtmlPaymentCardNumber = $admSession->getData("xp_payment_card");
30
- $quote = Mage::getSingleton('checkout/session')->getQuote();
31
- $paymentCardNumber = $quote->getPayment()->getData("xp_payment_card");
32
- $cardData = Mage::getModel("xpaymentsconnector/usercards")->load($paymentCardNumber)->getData();
33
  ?>
34
  <?php echo $this->getMethod()->getTitle(); ?>
35
  <br />
@@ -37,13 +34,13 @@ $cardData = Mage::getModel("xpaymentsconnector/usercards")->load($paymentCardNum
37
  <span id="x-payment-card-info">
38
  <?php echo $this->__("For current order we used your payment card (**%s)",$cardData['last_4_cc_num']); ?>
39
  </span>
40
- <?php elseif ($orderId = $this->getRequest()->getParam("order_id")): ?>
41
- <?php $orderCardData = unserialize(Mage::getModel('sales/order')->load($orderId)->getData("xp_card_data")); ?>
42
  <span id="x-payment-card-info">
43
  <?php echo $this->__("For current order we used your payment card (**%s)",$orderCardData['last_4_cc_num']); ?>
44
  </span>
45
  <?php elseif ($adminhtmlPaymentCardNumber): ?>
46
- <?php $cardData = Mage::getModel("xpaymentsconnector/usercards")->load($adminhtmlPaymentCardNumber)->getData(); ?>
47
  <?php if(!empty($cardData)): ?>
48
  <span id="x-payment-card-info">
49
  <?php echo $this->__("For current order we used your payment card (**%s)",$cardData['last_4_cc_num']); ?>
25
  */
26
  ?>
27
  <?php
28
+ $adminhtmlPaymentCardNumber = $this->getAdminXpPaymentCard();
29
+ $cardData = $this->getCardData();
 
 
 
30
  ?>
31
  <?php echo $this->getMethod()->getTitle(); ?>
32
  <br />
34
  <span id="x-payment-card-info">
35
  <?php echo $this->__("For current order we used your payment card (**%s)",$cardData['last_4_cc_num']); ?>
36
  </span>
37
+ <?php elseif ($orderId = $this->getRequest()->getParam('order_id')): ?>
38
+ <?php $orderCardData = $this->getOrderCardData($orderId); ?>
39
  <span id="x-payment-card-info">
40
  <?php echo $this->__("For current order we used your payment card (**%s)",$orderCardData['last_4_cc_num']); ?>
41
  </span>
42
  <?php elseif ($adminhtmlPaymentCardNumber): ?>
43
+ <?php $cardData = $this->getCardData($adminhtmlPaymentCardNumber); ?>
44
  <?php if(!empty($cardData)): ?>
45
  <span id="x-payment-card-info">
46
  <?php echo $this->__("For current order we used your payment card (**%s)",$cardData['last_4_cc_num']); ?>
app/design/frontend/rwd/default/template/xpaymentsconnector/customer/usercards/cardadd.phtml CHANGED
@@ -25,8 +25,7 @@
25
  */
26
  ?>
27
  <?php
28
- $xpayUrlMas = parse_url(Mage::getModel('xpaymentsconnector/payment_cc')->getConfig('xpay_url'));
29
- $xpayUrl = $xpayUrlMas["scheme"]."://".$xpayUrlMas["host"];
30
  ?>
31
 
32
  <div class="page-title">
25
  */
26
  ?>
27
  <?php
28
+ $xpayUrl = $this->getXpayUrl();
 
29
  ?>
30
 
31
  <div class="page-title">
app/design/frontend/rwd/default/template/xpaymentsconnector/customer/usercards/list.phtml CHANGED
@@ -25,14 +25,14 @@
25
  */
26
  ?>
27
  <?php $_items = $this->getItems(); ?>
28
- <?php $cardUsageOptions = Mage::getModel("xpaymentsconnector/usercards")->getCardsUsageOptions();?>
29
  <div class="page-title">
30
- <h1><?php echo Mage::helper('xpaymentsconnector')->__('Edit payment cards list (X-Payments)') ?></h1>
31
  </div>
32
  <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
33
  <?php echo $this->getChildHtml('pager'); ?>
34
  <form id="credit-card-list-form" method="post" action="<?php echo Mage::getUrl("xpaymentsconnector/customer/usercards");?>">
35
- <?php if(count($_items)): ?>
36
  <table class="data-table" id="my-credit-cards-table">
37
  <col width="1" />
38
  <col width="1" />
@@ -42,12 +42,12 @@
42
  <thead>
43
  <tr>
44
  <th><a id="select-all-cards" href="#" onclick="addRelatedCard(event)">Select all</a>
45
- /
46
  <a id="unselect-all-cards" href="#" onclick="removeRelatedCard(event)">Unselect all</a></th>
47
- <th><?php echo Mage::helper('xpaymentsconnector')->__('Card id #') ?></th>
48
- <th><?php echo Mage::helper('xpaymentsconnector')->__('Card number') ?></th>
49
- <th><?php echo Mage::helper('xpaymentsconnector')->__('Card type') ?></th>
50
- <th><?php echo Mage::helper('xpaymentsconnector')->__('Usage card type'); ?></th>
51
  </tr>
52
  </thead>
53
  <tbody>
@@ -65,18 +65,18 @@
65
  </table>
66
  <input type="hidden" name="action" value="remove">
67
 
68
- <script type="text/javascript">decorateTable('my-credit-cards-table')</script>
69
- <?php else: ?>
70
- <p><?php echo Mage::helper('xpaymentsconnector')->__('You have no saved credit cards yet.'); ?></p>
71
- <?php endif; ?>
72
- <?php echo $this->getChildHtml('pager'); ?>
73
- <div class="buttons-set">
74
- <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
75
- <?php if(count($_items)): ?>
76
- <button class="button" title="Save" type="submit"><span><span>Remove</span></span></button>
77
  <?php endif; ?>
78
- <button onclick="window.location='<?php echo $this->getAddCardUrl();?>'" class="button" title="Add new card" type="button"><span><span>Add new card</span></span></button>
79
- </div>
 
 
 
 
 
 
80
  </form>
81
 
82
  <script type="text/javascript">
25
  */
26
  ?>
27
  <?php $_items = $this->getItems(); ?>
28
+ <?php $cardUsageOptions = $this->getCardsUsageOptions();?>
29
  <div class="page-title">
30
+ <h1><?php echo $this->__('Edit payment cards list (X-Payments)') ?></h1>
31
  </div>
32
  <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
33
  <?php echo $this->getChildHtml('pager'); ?>
34
  <form id="credit-card-list-form" method="post" action="<?php echo Mage::getUrl("xpaymentsconnector/customer/usercards");?>">
35
+ <?php if(count($_items)): ?>
36
  <table class="data-table" id="my-credit-cards-table">
37
  <col width="1" />
38
  <col width="1" />
42
  <thead>
43
  <tr>
44
  <th><a id="select-all-cards" href="#" onclick="addRelatedCard(event)">Select all</a>
45
+ /
46
  <a id="unselect-all-cards" href="#" onclick="removeRelatedCard(event)">Unselect all</a></th>
47
+ <th><?php echo $this->__('Card id #') ?></th>
48
+ <th><?php echo $this->__('Card number') ?></th>
49
+ <th><?php echo $this->__('Card type') ?></th>
50
+ <th><?php echo $this->__('Usage card type'); ?></th>
51
  </tr>
52
  </thead>
53
  <tbody>
65
  </table>
66
  <input type="hidden" name="action" value="remove">
67
 
68
+ <script type="text/javascript">decorateTable('my-credit-cards-table')</script>
69
+ <?php else: ?>
70
+ <p><?php echo $this->__('You have no saved credit cards yet.'); ?></p>
 
 
 
 
 
 
71
  <?php endif; ?>
72
+ <?php echo $this->getChildHtml('pager'); ?>
73
+ <div class="buttons-set">
74
+ <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
75
+ <?php if(count($_items)): ?>
76
+ <button class="button" title="Save" type="submit"><span><span>Remove</span></span></button>
77
+ <?php endif; ?>
78
+ <button onclick="window.location='<?php echo $this->getAddCardUrl();?>'" class="button" title="Add new card" type="button"><span><span>Add new card</span></span></button>
79
+ </div>
80
  </form>
81
 
82
  <script type="text/javascript">
app/design/frontend/rwd/default/template/xpaymentsconnector/info/prepaidpayments.phtml CHANGED
@@ -25,9 +25,7 @@
25
  */
26
  ?>
27
  <?php
28
- $admSession = Mage::getSingleton('adminhtml/session');
29
- $xpPrepaidPaymentsCard = $admSession->getData("xp_prepaid_payments");
30
- $cardData = Mage::getModel("xpaymentsconnector/usercards")->load($xpPrepaidPaymentsCard)->getData();
31
  ?>
32
  <?php echo $this->getMethod()->getTitle(); ?>
33
  <br />
@@ -36,7 +34,7 @@ $cardData = Mage::getModel("xpaymentsconnector/usercards")->load($xpPrepaidPayme
36
  <?php echo $this->__("For current order we charged funds from your payment card (**%s)",$cardData['last_4_cc_num']); ?>
37
  </span>
38
  <?php elseif ($orderId = $this->getRequest()->getParam("order_id")): ?>
39
- <?php $orderCardData = unserialize(Mage::getModel('sales/order')->load($orderId)->getData("xp_card_data")); ?>
40
  <span id="x-payment-prepaid-card-info">
41
  <?php echo $this->__("For current order we charged funds from your payment card (**%s)",$orderCardData['last_4_cc_num']); ?>
42
  </span>
25
  */
26
  ?>
27
  <?php
28
+ $cardData = $this->getCardData()
 
 
29
  ?>
30
  <?php echo $this->getMethod()->getTitle(); ?>
31
  <br />
34
  <?php echo $this->__("For current order we charged funds from your payment card (**%s)",$cardData['last_4_cc_num']); ?>
35
  </span>
36
  <?php elseif ($orderId = $this->getRequest()->getParam("order_id")): ?>
37
+ <?php $orderCardData = $this->getOrderCardData($orderId); ?>
38
  <span id="x-payment-prepaid-card-info">
39
  <?php echo $this->__("For current order we charged funds from your payment card (**%s)",$orderCardData['last_4_cc_num']); ?>
40
  </span>
app/design/frontend/rwd/default/template/xpaymentsconnector/info/savedcards.phtml CHANGED
@@ -25,11 +25,8 @@
25
  */
26
  ?>
27
  <?php
28
- $admSession = Mage::getSingleton('adminhtml/session');
29
- $adminhtmlPaymentCardNumber = $admSession->getData("xp_payment_card");
30
- $quote = Mage::getSingleton('checkout/session')->getQuote();
31
- $paymentCardNumber = $quote->getPayment()->getData("xp_payment_card");
32
- $cardData = Mage::getModel("xpaymentsconnector/usercards")->load($paymentCardNumber)->getData();
33
  ?>
34
  <?php echo $this->getMethod()->getTitle(); ?>
35
  <br />
@@ -37,13 +34,13 @@ $cardData = Mage::getModel("xpaymentsconnector/usercards")->load($paymentCardNum
37
  <span id="x-payment-card-info">
38
  <?php echo $this->__("For current order we used your payment card (**%s)",$cardData['last_4_cc_num']); ?>
39
  </span>
40
- <?php elseif ($orderId = $this->getRequest()->getParam("order_id")): ?>
41
- <?php $orderCardData = unserialize(Mage::getModel('sales/order')->load($orderId)->getData("xp_card_data")); ?>
42
  <span id="x-payment-card-info">
43
  <?php echo $this->__("For current order we used your payment card (**%s)",$orderCardData['last_4_cc_num']); ?>
44
  </span>
45
  <?php elseif ($adminhtmlPaymentCardNumber): ?>
46
- <?php $cardData = Mage::getModel("xpaymentsconnector/usercards")->load($adminhtmlPaymentCardNumber)->getData(); ?>
47
  <?php if(!empty($cardData)): ?>
48
  <span id="x-payment-card-info">
49
  <?php echo $this->__("For current order we used your payment card (**%s)",$cardData['last_4_cc_num']); ?>
25
  */
26
  ?>
27
  <?php
28
+ $adminhtmlPaymentCardNumber = $this->getAdminXpPaymentCard();
29
+ $cardData = $this->getCardData();
 
 
 
30
  ?>
31
  <?php echo $this->getMethod()->getTitle(); ?>
32
  <br />
34
  <span id="x-payment-card-info">
35
  <?php echo $this->__("For current order we used your payment card (**%s)",$cardData['last_4_cc_num']); ?>
36
  </span>
37
+ <?php elseif ($orderId = $this->getRequest()->getParam('order_id')): ?>
38
+ <?php $orderCardData = $this->getOrderCardData($orderId); ?>
39
  <span id="x-payment-card-info">
40
  <?php echo $this->__("For current order we used your payment card (**%s)",$orderCardData['last_4_cc_num']); ?>
41
  </span>
42
  <?php elseif ($adminhtmlPaymentCardNumber): ?>
43
+ <?php $cardData = $this->getCardData($adminhtmlPaymentCardNumber); ?>
44
  <?php if(!empty($cardData)): ?>
45
  <span id="x-payment-card-info">
46
  <?php echo $this->__("For current order we used your payment card (**%s)",$cardData['last_4_cc_num']); ?>
js/xpayment/settings.css CHANGED
@@ -436,10 +436,6 @@ iframe .buttonRow {
436
  padding-right: 25px;
437
  }
438
 
439
- #new-card-block #xpayment-iframe-block #xp-iframe{
440
- height: 260px;
441
- }
442
-
443
  /* xp transaction form */
444
  .xp_fast_transactions input {
445
  max-width: 170px;
436
  padding-right: 25px;
437
  }
438
 
 
 
 
 
439
  /* xp transaction form */
440
  .xp_fast_transactions input {
441
  max-width: 170px;
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>CDev_XPaymentsConnector</name>
4
- <version>1.4.1</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">OSL 3.0</license>
7
  <channel>community</channel>
@@ -10,11 +10,11 @@
10
  <description>X-Payments connector&#xD;
11
  This extension integrates Magento with X-Payments - a PA-DSS certified payment module.&#xD;
12
  </description>
13
- <notes>Version number: 1.4.1</notes>
14
  <authors><author><name>Valerii Demidov</name><user>Valerii</user><email>vdemidov@corp.web4pro.com.ua</email></author></authors>
15
- <date>2015-03-24</date>
16
- <time>13:46:22</time>
17
- <contents><target name="magecommunity"><dir name="Cdev"><dir name="XPaymentsConnector"><dir name="Block"><dir name="Adminhtml"><dir name="Customer"><dir name="Edit"><dir name="Renderer"><file name="Cardtype.php" hash="62499b375fa9c7ba091ff7763d54a95d"/><file name="Txnid.php" hash="993e4c40a3bb3b55f5b1a5a99adffd78"/></dir><dir name="Tab"><file name="Usercards.php" hash="248e454bc1c43d41013fd5d077b39961"/></dir></dir></dir><dir name="Sales"><dir name="Order"><dir name="View"><dir name="Tab"><file name="Xporderstate.php" hash="aeed145a7f006c5e5720ba2588a7669b"/></dir></dir></dir></dir><dir name="System"><dir name="Config"><dir name="Form"><file name="Subselect.php" hash="c989f9ce4b9af2885c6d28e874825eab"/></dir></dir></dir><dir name="Usercards"><file name="Grid.php" hash="5250ace1bdafb448089b752df44fc9b7"/></dir></dir><file name="Beforesuccess.php" hash="4c22841e4c28e66d4d363523899b073d"/><file name="Cancel.php" hash="3283657e21047278d81ac4478ac81de6"/><dir name="Checkout"><dir name="Onepage"><file name="Orderdetail.php" hash="5a62c069916dca4cb809adb476a230dc"/><file name="Settings.php" hash="2422adb2924c023d9829f376a893d553"/></dir></dir><file name="Control.php" hash="e0ef77a236030598882937acb2a9c4e0"/><dir name="Customer"><dir name="Account"><file name="Navigation.php" hash="53fbec326cc5c61b929414df6f71e804"/></dir><file name="Cardadd.php" hash="41d842181caa2e5ef26c6091f7a73943"/><file name="Success.php" hash="54f243e60b735cdd5cd879be65838fee"/><file name="Usercards.php" hash="9fc41f226a81956028418a7570994df9"/></dir><file name="Failure.php" hash="537aec3d3ee63ff1ac2d2300c2ca259e"/><dir name="Form"><file name="Cc.php" hash="2f4fbca4ddc11b541d4a2781aae7350e"/><file name="Container.php" hash="0494ad27c46dc3f7f89342188a5448ce"/><file name="Prepaidpayments.php" hash="9a11a9423b4dfc37d607425be54c9a4a"/><file name="Savedcards.php" hash="6e7a8bbfd18a8635d31e659772e2b5ed"/></dir><dir name="Info"><file name="Cc.php" hash="80ec2f2dd7691519d481977ab7bdcec4"/><file name="Prepaidpayments.php" hash="5046201a95c114c6020696b7d2855b7f"/><file name="Savedcards.php" hash="5e8b71515b6d516621aea6abfda332fe"/></dir><dir name="Recurring"><dir name="Profile"><file name="View.php" hash="5e71720c6b6817972b4970df2fd646d2"/></dir></dir><file name="Redirect.php" hash="380f772b003ba0b02e275bd44c67e751"/><file name="Success.php" hash="d2f023bc2206cbb33997b791a57b1b4e"/></dir><dir name="Helper"><file name="Data.php" hash="a9c838c5cf4a41b3e5a0f1aa3bcab922"/></dir><dir name="Model"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Source"><file name="Placedisplay.php" hash="a42a68646dc2e1aa77502ec1be0dbaf7"/></dir></dir></dir></dir><dir name="Mysql4"><dir name="Paymentconfiguration"><file name="Collection.php" hash="98760f276af5182d42801865cb116db4"/></dir><file name="Paymentconfiguration.php" hash="ca045f953ec018c583279340c137ff71"/><dir name="Usercards"><file name="Collection.php" hash="6df6d26bef085e86c6db625487006086"/></dir><file name="Usercards.php" hash="ffb98ad5a0c252bbbf14adb086cf0d3c"/></dir><file name="Observer.php" hash="4bcc25311a23b31639bfe85e9578dea4"/><dir name="Payment"><file name="Cc.php" hash="74ab554fc15043b754526d2637f9f0c3"/><file name="Prepaidpayments.php" hash="9bbab2a26748c59609d6c81d8fc37c41"/><dir name="Recurring"><file name="Profile.php" hash="7c0e5c707531e5d258b8c493243c00a1"/></dir><file name="Savedcards.php" hash="3411a8224120800477a857a6a3dbe63b"/></dir><file name="Paymentconfiguration.php" hash="c0a6c5b610e42037f9904247e657a0e6"/><dir name="Quote"><dir name="Address"><dir name="Total"><dir name="Nominal"><dir name="Recurring"><file name="Discount.php" hash="17d12a5ac2ad95a7882ab651502ce98a"/><dir name="Initialfee"><file name="Tax.php" hash="892804e777f2e1bba1e57cd03d96e5b2"/></dir></dir></dir><file name="Nominal.php" hash="091dd174cb2b571a6739b34071fbc9a6"/></dir></dir></dir><file name="Quote.php" hash="9ddf19dfd97cbbe6423e80207f81a42f"/><dir name="Sales"><dir name="Recurring"><file name="Profile.php" hash="f2bdc6e081443ab538cb99e1f5fbe77c"/></dir></dir><dir name="Source"><file name="Paymentconfiguration.php" hash="eb9b8e1187a4a4f4614582d5f7932c37"/></dir><file name="Usercards.php" hash="049b38f03920a17d5dbd0ba5e3a834cc"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="CustomerController.php" hash="8f2bc887259b9d5ae6f3a731e7a2eb6a"/></dir><file name="ControlController.php" hash="92e1380179483d97cd27be1d147833ba"/><file name="CustomerController.php" hash="075e976ce6a5b9fbe7844a4a157fc41c"/><file name="ProcessingController.php" hash="49ba28429e85b110a60fde956a5fd2bd"/></dir><dir name="etc"><file name="config.xml" hash="f695161c0abc02c5b4c400e23eaa3fc0"/><file name="system.xml" hash="40015b50b9b503d49bed0e850cd78e03"/></dir><dir name="sql"><dir name="xpaymentsconnector_setup"><file name="mysql4-install-1.0.0.php" hash="5b6ed901a54700d986dd81029104ed72"/><file name="mysql4-upgrade-1.0.0-1.0.1.php" hash="5e2da32a0f87b747a5e9f3d9095e962a"/><file name="mysql4-upgrade-1.0.1-1.0.2.php" hash="566cd8aa894ff488f60bd718ad8b2772"/><file name="mysql4-upgrade-1.0.2-1.0.3.php" hash="0f44cf02457c2b6a887b399e94b89e57"/><file name="mysql4-upgrade-1.0.3-1.0.4.php" hash="f353d20a6d6ac827be5cd581cc988660"/><file name="mysql4-upgrade-1.0.4-1.0.5.php" hash="9b71385496b9b42e5a79b0cbbc557dff"/><file name="mysql4-upgrade-1.0.5-1.0.6.php" hash="fa79555b4802a96579f314a670ab8ed3"/><file name="mysql4-upgrade-1.0.6-1.0.7.php" hash="b9708303f3160fc0c9347f4600e27aba"/><file name="mysql4-upgrade-1.0.7-1.0.8.php" hash="2d07945a0438bf29f1386e47b2b5498b"/><file name="mysql4-upgrade-1.0.8-1.0.9.php" hash="83a4aace7f0e389c5caaaf97675f6c24"/><file name="mysql4-upgrade-1.0.9-1.1.0.php" hash="57f95a027f6f0b4871f883e370dd1f51"/><file name="mysql4-upgrade-1.1.0-1.1.1.php" hash="61c4abd29823a909e14a9653ddd41825"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="xpaymentsconnector.xml" hash="4a769cd81f4c37da59b400510c49593d"/></dir><dir name="template"><dir name="xpaymentsconnector"><file name="control.phtml" hash="66bb941b66f57585b2035f29afcea22d"/><dir name="form"><file name="prepaidpayments.phtml" hash="bfe70a3c62187bcd9915fb621eda58b9"/><file name="savedcards.phtml" hash="27ef4734f19ded0eb98214276a58e550"/></dir><dir name="info"><file name="cc.phtml" hash="67282ccf6f932de083bc477cc4238d22"/><file name="prepaidpayments.phtml" hash="f4bd2aa628257cb1f3450a1632a0b771"/><file name="savedcards.phtml" hash="2f79fa323b250786fb4acbee4a2a8809"/></dir><file name="info.phtml" hash="ab312e6f206c51ff3134b9a3ce5b5440"/><dir name="order"><dir name="view"><dir name="tab"><file name="xporderstate.phtml" hash="9147e963aa81731307b8c854ca8f4f64"/></dir></dir></dir><dir name="pdf"><file name="info.phtml" hash="9603c212b8efd1247ce36239d7365a73"/></dir><dir name="usercards"><dir name="tab"><file name="js.phtml" hash="ae8189ee0b9f0bd09d61692403527331"/></dir></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="default"><dir name="default"><dir name="layout"><file name="xpaymentsconnector.xml" hash="2c071c6f81f40e45920e6b0f5cc49eea"/></dir><dir name="template"><dir name="xpaymentsconnector"><file name="blank.phtml" hash="a22778db8681a9aaee22eb2d8f8c6533"/><file name="cancel.phtml" hash="3ba9764fcbf85a3504664b342450ec2b"/><dir name="checkout"><dir name="onepage"><file name="beforesuccess.phtml" hash="8e05eff3705ac40d758c21523640f969"/><file name="order-detail.phtml" hash="ccd3d6d0dd774f939b66f602098331e5"/><dir name="review"><file name="button.phtml" hash="ed96034bc129f74af1020384499840a9"/></dir><file name="xpayment-iframe.phtml" hash="a3916b5115beff8b9a8f3338c85cdf24"/></dir></dir><dir name="customer"><file name="cardaddsuccess.phtml" hash="6771721173b99c0cf70391c22d878276"/><dir name="usercards"><file name="cardadd.phtml" hash="8b347d0f43deb95710709ab7010bf1d7"/><file name="list.phtml" hash="5bf980a24c788af17cd80a8bf511807f"/></dir></dir><file name="failure.phtml" hash="3d0691440fda2d1f3a314cd151d6ea90"/><dir name="form"><file name="cc.phtml" hash="9d6f013e0b935168865364aa99f23df4"/><file name="savedcards.phtml" hash="acbfcc5771443fcee06d715c3c049546"/></dir><dir name="info"><file name="cc.phtml" hash="9f96547c119d966eb26c67fb557cf1b8"/><file name="prepaidpayments.phtml" hash="be0118e1c31c07171bddb63ec9e15a3f"/><file name="savedcards.phtml" hash="eb42bdfb18212734d640bf2f60f6b95d"/></dir><file name="redirect.phtml" hash="4c9c74e94c9a3015dee181a0ef978550"/></dir></dir></dir></dir><dir name="rwd"><dir name="default"><dir name="layout"><file name="xpaymentsconnector.xml" hash="2c071c6f81f40e45920e6b0f5cc49eea"/></dir><dir name="template"><dir name="xpaymentsconnector"><file name="blank.phtml" hash="a22778db8681a9aaee22eb2d8f8c6533"/><file name="cancel.phtml" hash="3ba9764fcbf85a3504664b342450ec2b"/><dir name="checkout"><dir name="onepage"><file name="beforesuccess.phtml" hash="8e05eff3705ac40d758c21523640f969"/><file name="order-detail.phtml" hash="ccd3d6d0dd774f939b66f602098331e5"/><dir name="review"><file name="button.phtml" hash="ed96034bc129f74af1020384499840a9"/></dir><file name="xpayment-iframe.phtml" hash="a3916b5115beff8b9a8f3338c85cdf24"/></dir></dir><dir name="customer"><file name="cardaddsuccess.phtml" hash="6771721173b99c0cf70391c22d878276"/><dir name="usercards"><file name="cardadd.phtml" hash="8b347d0f43deb95710709ab7010bf1d7"/><file name="list.phtml" hash="5bf980a24c788af17cd80a8bf511807f"/></dir></dir><file name="failure.phtml" hash="3d0691440fda2d1f3a314cd151d6ea90"/><dir name="form"><file name="cc.phtml" hash="9d6f013e0b935168865364aa99f23df4"/><file name="savedcards.phtml" hash="acbfcc5771443fcee06d715c3c049546"/></dir><dir name="info"><file name="cc.phtml" hash="9f96547c119d966eb26c67fb557cf1b8"/><file name="prepaidpayments.phtml" hash="be0118e1c31c07171bddb63ec9e15a3f"/><file name="savedcards.phtml" hash="eb42bdfb18212734d640bf2f60f6b95d"/></dir><file name="redirect.phtml" hash="4c9c74e94c9a3015dee181a0ef978550"/></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Cdev_XPaymentsConnector.xml" hash="3b87bc5a9c17519d38e7de93b5ad13b9"/></dir></target><target name="mage"><dir name="js"><dir name="xpayment"><file name="backend-xpayment.js" hash="adb23ae4c5a320318d9e3cf26558fffd"/><file name="checkout-submit.js" hash="e5a6861f279564f63c73cbb110f06938"/><dir name="images"><file name="arrow-down.png" hash="a0beb6cd0ca4dd686ee5bf772432176e"/><file name="arrow-up.png" hash="df40115c816a7e08016c04120ac22e53"/><file name="card_types.png" hash="d35ba97c55e2cc1273a0dd1d7862d84c"/><file name="loader.gif" hash="e67d85a8d2d4021514815d0ff4d65173"/></dir><file name="settings.css" hash="39f4a4958e19b0429867f06ee7cd011a"/></dir></dir></target><target name="magelocale"><dir><dir name="en_US"><file name="Cdev_XPaymentsConnector.csv" hash="b957ec641977907f3af1efcaed06c794"/></dir></dir></target></contents>
18
  <compatible/>
19
  <dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php></required></dependencies>
20
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>CDev_XPaymentsConnector</name>
4
+ <version>1.4.9</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">OSL 3.0</license>
7
  <channel>community</channel>
10
  <description>X-Payments connector&#xD;
11
  This extension integrates Magento with X-Payments - a PA-DSS certified payment module.&#xD;
12
  </description>
13
+ <notes>Version number: 1.4.9</notes>
14
  <authors><author><name>Valerii Demidov</name><user>Valerii</user><email>vdemidov@corp.web4pro.com.ua</email></author></authors>
15
+ <date>2015-04-23</date>
16
+ <time>12:41:58</time>
17
+ <contents><target name="magecommunity"><dir name="Cdev"><dir name="XPaymentsConnector"><dir name="Block"><dir name="Adminhtml"><dir name="Customer"><dir name="Edit"><dir name="Renderer"><file name="Cardtype.php" hash="62499b375fa9c7ba091ff7763d54a95d"/><file name="Txnid.php" hash="993e4c40a3bb3b55f5b1a5a99adffd78"/></dir><dir name="Tab"><file name="Usercards.php" hash="248e454bc1c43d41013fd5d077b39961"/></dir></dir></dir><dir name="Sales"><dir name="Order"><dir name="View"><dir name="Tab"><file name="Xporderstate.php" hash="aeed145a7f006c5e5720ba2588a7669b"/></dir></dir></dir></dir><dir name="System"><dir name="Config"><dir name="Form"><file name="Subselect.php" hash="c989f9ce4b9af2885c6d28e874825eab"/></dir></dir></dir><dir name="Usercards"><file name="Grid.php" hash="5250ace1bdafb448089b752df44fc9b7"/></dir></dir><file name="Beforesuccess.php" hash="4c22841e4c28e66d4d363523899b073d"/><file name="Cancel.php" hash="3283657e21047278d81ac4478ac81de6"/><dir name="Checkout"><dir name="Onepage"><file name="Orderdetail.php" hash="5a62c069916dca4cb809adb476a230dc"/><file name="Settings.php" hash="2422adb2924c023d9829f376a893d553"/></dir></dir><file name="Control.php" hash="e0ef77a236030598882937acb2a9c4e0"/><dir name="Customer"><dir name="Account"><file name="Navigation.php" hash="53fbec326cc5c61b929414df6f71e804"/></dir><file name="Cardadd.php" hash="55b607ef5053bf12f5dc7e1c50306406"/><file name="Success.php" hash="54f243e60b735cdd5cd879be65838fee"/><file name="Usercards.php" hash="76de3856ad42383c008400245a3135ae"/></dir><file name="Failure.php" hash="537aec3d3ee63ff1ac2d2300c2ca259e"/><dir name="Form"><file name="Cc.php" hash="2f4fbca4ddc11b541d4a2781aae7350e"/><file name="Container.php" hash="0494ad27c46dc3f7f89342188a5448ce"/><file name="Prepaidpayments.php" hash="9a11a9423b4dfc37d607425be54c9a4a"/><file name="Savedcards.php" hash="6e7a8bbfd18a8635d31e659772e2b5ed"/></dir><dir name="Info"><file name="Cc.php" hash="80ec2f2dd7691519d481977ab7bdcec4"/><file name="Prepaidpayments.php" hash="e72742bba292982787de587f9a53ce60"/><file name="Savedcards.php" hash="14de7c069fbd68d126fc0dce72267bf4"/></dir><dir name="Recurring"><dir name="Profile"><file name="View.php" hash="5e71720c6b6817972b4970df2fd646d2"/></dir></dir><file name="Redirect.php" hash="380f772b003ba0b02e275bd44c67e751"/><file name="Success.php" hash="d2f023bc2206cbb33997b791a57b1b4e"/></dir><dir name="Helper"><file name="Data.php" hash="c5881819118297555855303193272954"/></dir><dir name="Model"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Source"><file name="Placedisplay.php" hash="a42a68646dc2e1aa77502ec1be0dbaf7"/></dir></dir></dir></dir><dir name="Mysql4"><dir name="Paymentconfiguration"><file name="Collection.php" hash="98760f276af5182d42801865cb116db4"/></dir><file name="Paymentconfiguration.php" hash="ca045f953ec018c583279340c137ff71"/><dir name="Usercards"><file name="Collection.php" hash="6df6d26bef085e86c6db625487006086"/></dir><file name="Usercards.php" hash="ffb98ad5a0c252bbbf14adb086cf0d3c"/></dir><file name="Observer.php" hash="b2573550d5f487afed5f45992f705724"/><dir name="Payment"><file name="Cc.php" hash="3512ebb0b1b864053934248baeaaebc7"/><file name="Prepaidpayments.php" hash="9bbab2a26748c59609d6c81d8fc37c41"/><dir name="Recurring"><file name="Profile.php" hash="1d0a2ac393a55f586a1cc8016538e5df"/></dir><file name="Savedcards.php" hash="3411a8224120800477a857a6a3dbe63b"/></dir><file name="Paymentconfiguration.php" hash="c0a6c5b610e42037f9904247e657a0e6"/><dir name="Quote"><dir name="Address"><dir name="Total"><dir name="Nominal"><dir name="Recurring"><file name="Discount.php" hash="17d12a5ac2ad95a7882ab651502ce98a"/><dir name="Initialfee"><file name="Tax.php" hash="892804e777f2e1bba1e57cd03d96e5b2"/></dir></dir></dir><file name="Nominal.php" hash="091dd174cb2b571a6739b34071fbc9a6"/></dir></dir></dir><file name="Quote.php" hash="9ddf19dfd97cbbe6423e80207f81a42f"/><dir name="Sales"><dir name="Recurring"><file name="Profile.php" hash="f2bdc6e081443ab538cb99e1f5fbe77c"/></dir></dir><dir name="Source"><file name="Paymentconfiguration.php" hash="eb9b8e1187a4a4f4614582d5f7932c37"/></dir><file name="Usercards.php" hash="049b38f03920a17d5dbd0ba5e3a834cc"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="CustomerController.php" hash="8f2bc887259b9d5ae6f3a731e7a2eb6a"/></dir><file name="ControlController.php" hash="92e1380179483d97cd27be1d147833ba"/><file name="CustomerController.php" hash="075e976ce6a5b9fbe7844a4a157fc41c"/><file name="ProcessingController.php" hash="3d9efc8e82def6e652f898e9775b5fb5"/></dir><dir name="etc"><file name="config.xml" hash="337e023e1904f28b0a0de308fbba9469"/><file name="system.xml" hash="62abd4591d85dbaba8e3afa521fac181"/></dir><dir name="sql"><dir name="xpaymentsconnector_setup"><file name="mysql4-install-1.0.0.php" hash="5b6ed901a54700d986dd81029104ed72"/><file name="mysql4-upgrade-1.0.0-1.0.1.php" hash="5e2da32a0f87b747a5e9f3d9095e962a"/><file name="mysql4-upgrade-1.0.1-1.0.2.php" hash="566cd8aa894ff488f60bd718ad8b2772"/><file name="mysql4-upgrade-1.0.2-1.0.3.php" hash="0f44cf02457c2b6a887b399e94b89e57"/><file name="mysql4-upgrade-1.0.3-1.0.4.php" hash="f353d20a6d6ac827be5cd581cc988660"/><file name="mysql4-upgrade-1.0.4-1.0.5.php" hash="9b71385496b9b42e5a79b0cbbc557dff"/><file name="mysql4-upgrade-1.0.5-1.0.6.php" hash="fa79555b4802a96579f314a670ab8ed3"/><file name="mysql4-upgrade-1.0.6-1.0.7.php" hash="b9708303f3160fc0c9347f4600e27aba"/><file name="mysql4-upgrade-1.0.7-1.0.8.php" hash="2d07945a0438bf29f1386e47b2b5498b"/><file name="mysql4-upgrade-1.0.8-1.0.9.php" hash="83a4aace7f0e389c5caaaf97675f6c24"/><file name="mysql4-upgrade-1.0.9-1.1.0.php" hash="57f95a027f6f0b4871f883e370dd1f51"/><file name="mysql4-upgrade-1.1.0-1.1.1.php" hash="61c4abd29823a909e14a9653ddd41825"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="xpaymentsconnector.xml" hash="4a769cd81f4c37da59b400510c49593d"/></dir><dir name="template"><dir name="xpaymentsconnector"><file name="control.phtml" hash="66bb941b66f57585b2035f29afcea22d"/><dir name="form"><file name="prepaidpayments.phtml" hash="bfe70a3c62187bcd9915fb621eda58b9"/><file name="savedcards.phtml" hash="27ef4734f19ded0eb98214276a58e550"/></dir><dir name="info"><file name="cc.phtml" hash="67282ccf6f932de083bc477cc4238d22"/><file name="prepaidpayments.phtml" hash="f4bd2aa628257cb1f3450a1632a0b771"/><file name="savedcards.phtml" hash="2f79fa323b250786fb4acbee4a2a8809"/></dir><file name="info.phtml" hash="ab312e6f206c51ff3134b9a3ce5b5440"/><dir name="order"><dir name="view"><dir name="tab"><file name="xporderstate.phtml" hash="9147e963aa81731307b8c854ca8f4f64"/></dir></dir></dir><dir name="pdf"><file name="info.phtml" hash="9603c212b8efd1247ce36239d7365a73"/></dir><dir name="usercards"><dir name="tab"><file name="js.phtml" hash="ae8189ee0b9f0bd09d61692403527331"/></dir></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="default"><dir name="default"><dir name="layout"><file name="xpaymentsconnector.xml" hash="2c071c6f81f40e45920e6b0f5cc49eea"/></dir><dir name="template"><dir name="xpaymentsconnector"><file name="blank.phtml" hash="a22778db8681a9aaee22eb2d8f8c6533"/><file name="cancel.phtml" hash="3ba9764fcbf85a3504664b342450ec2b"/><dir name="checkout"><dir name="onepage"><file name="beforesuccess.phtml" hash="8e05eff3705ac40d758c21523640f969"/><file name="order-detail.phtml" hash="ccd3d6d0dd774f939b66f602098331e5"/><dir name="review"><file name="button.phtml" hash="ed96034bc129f74af1020384499840a9"/></dir><file name="xpayment-iframe.phtml" hash="a3916b5115beff8b9a8f3338c85cdf24"/></dir></dir><dir name="customer"><file name="cardaddsuccess.phtml" hash="6771721173b99c0cf70391c22d878276"/><dir name="usercards"><file name="cardadd.phtml" hash="abbd6134898330205f38169834fb793a"/><file name="list.phtml" hash="3b727cd04f8e94e20c791a36e39e9352"/></dir></dir><file name="failure.phtml" hash="3d0691440fda2d1f3a314cd151d6ea90"/><dir name="form"><file name="cc.phtml" hash="9d6f013e0b935168865364aa99f23df4"/><file name="savedcards.phtml" hash="acbfcc5771443fcee06d715c3c049546"/></dir><dir name="info"><file name="cc.phtml" hash="9f96547c119d966eb26c67fb557cf1b8"/><file name="prepaidpayments.phtml" hash="9dfb23cb730781e45847a1422947bc9c"/><file name="savedcards.phtml" hash="3fad183168a2245f27d24848eff79cd6"/></dir><file name="redirect.phtml" hash="4c9c74e94c9a3015dee181a0ef978550"/></dir></dir></dir></dir><dir name="rwd"><dir name="default"><dir name="layout"><file name="xpaymentsconnector.xml" hash="2c071c6f81f40e45920e6b0f5cc49eea"/></dir><dir name="template"><dir name="xpaymentsconnector"><file name="blank.phtml" hash="a22778db8681a9aaee22eb2d8f8c6533"/><file name="cancel.phtml" hash="3ba9764fcbf85a3504664b342450ec2b"/><dir name="checkout"><dir name="onepage"><file name="beforesuccess.phtml" hash="8e05eff3705ac40d758c21523640f969"/><file name="order-detail.phtml" hash="ccd3d6d0dd774f939b66f602098331e5"/><dir name="review"><file name="button.phtml" hash="ed96034bc129f74af1020384499840a9"/></dir><file name="xpayment-iframe.phtml" hash="a3916b5115beff8b9a8f3338c85cdf24"/></dir></dir><dir name="customer"><file name="cardaddsuccess.phtml" hash="6771721173b99c0cf70391c22d878276"/><dir name="usercards"><file name="cardadd.phtml" hash="abbd6134898330205f38169834fb793a"/><file name="list.phtml" hash="3b727cd04f8e94e20c791a36e39e9352"/></dir></dir><file name="failure.phtml" hash="3d0691440fda2d1f3a314cd151d6ea90"/><dir name="form"><file name="cc.phtml" hash="9d6f013e0b935168865364aa99f23df4"/><file name="savedcards.phtml" hash="acbfcc5771443fcee06d715c3c049546"/></dir><dir name="info"><file name="cc.phtml" hash="9f96547c119d966eb26c67fb557cf1b8"/><file name="prepaidpayments.phtml" hash="9dfb23cb730781e45847a1422947bc9c"/><file name="savedcards.phtml" hash="3fad183168a2245f27d24848eff79cd6"/></dir><file name="redirect.phtml" hash="4c9c74e94c9a3015dee181a0ef978550"/></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Cdev_XPaymentsConnector.xml" hash="3b87bc5a9c17519d38e7de93b5ad13b9"/></dir></target><target name="mage"><dir name="js"><dir name="xpayment"><file name="backend-xpayment.js" hash="adb23ae4c5a320318d9e3cf26558fffd"/><file name="checkout-submit.js" hash="e5a6861f279564f63c73cbb110f06938"/><dir name="images"><file name="arrow-down.png" hash="a0beb6cd0ca4dd686ee5bf772432176e"/><file name="arrow-up.png" hash="df40115c816a7e08016c04120ac22e53"/><file name="card_types.png" hash="d35ba97c55e2cc1273a0dd1d7862d84c"/><file name="loader.gif" hash="e67d85a8d2d4021514815d0ff4d65173"/></dir><file name="settings.css" hash="e3cf33ee22c2a9d76f257a950c877a45"/></dir></dir></target><target name="magelocale"><dir><dir name="en_US"><file name="Cdev_XPaymentsConnector.csv" hash="b957ec641977907f3af1efcaed06c794"/></dir></dir></target></contents>
18
  <compatible/>
19
  <dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php></required></dependencies>
20
  </package>