CDev_XPaymentsConnector - Version 1.3.3

Version Notes

Version number: 1.3.3

Download this release

Release Info

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


Code changes from version 1.3.2 to 1.3.3

Files changed (19) hide show
  1. app/code/community/Cdev/XPaymentsConnector/Block/Adminhtml/Customer/Edit/Renderer/Txnid.php +1 -1
  2. app/code/community/Cdev/XPaymentsConnector/Block/Adminhtml/Sales/Order/View/Tab/Xporderstate.php +20 -20
  3. app/code/community/Cdev/XPaymentsConnector/Block/Adminhtml/Usercards/Grid.php +3 -3
  4. app/code/community/Cdev/XPaymentsConnector/Block/Beforesuccess.php +3 -3
  5. app/code/community/Cdev/XPaymentsConnector/Block/Checkout/Onepage/Settings.php +1 -1
  6. app/code/community/Cdev/XPaymentsConnector/Block/Customer/Account/Navigation.php +1 -1
  7. app/code/community/Cdev/XPaymentsConnector/Block/Customer/Cardadd.php +7 -7
  8. app/code/community/Cdev/XPaymentsConnector/Block/Customer/Usercards.php +1 -1
  9. app/code/community/Cdev/XPaymentsConnector/Block/Form/Cc.php +12 -12
  10. app/code/community/Cdev/XPaymentsConnector/Block/Form/Container.php +1 -1
  11. app/code/community/Cdev/XPaymentsConnector/Block/Form/Prepaidpayments.php +2 -2
  12. app/code/community/Cdev/XPaymentsConnector/Block/Form/Savedcards.php +3 -3
  13. app/code/community/Cdev/XPaymentsConnector/Block/Recurring/Profile/View.php +5 -5
  14. app/code/community/Cdev/XPaymentsConnector/Block/Redirect.php +2 -2
  15. app/code/community/Cdev/XPaymentsConnector/Model/Quote/Address/Total/Nominal/Recurring/Discount.php +14 -0
  16. app/design/frontend/default/default/layout/xpaymentsconnector.xml +10 -0
  17. app/design/frontend/rwd/default/layout/xpaymentsconnector.xml +10 -0
  18. js/xpayment/settings.css +9 -5
  19. package.xml +5 -5
app/code/community/Cdev/XPaymentsConnector/Block/Adminhtml/Customer/Edit/Renderer/Txnid.php CHANGED
@@ -29,7 +29,7 @@ class Cdev_XPaymentsConnector_Block_Adminhtml_Customer_Edit_Renderer_Txnid exten
29
  public function render(Varien_Object $row){
30
 
31
  $txnid = $row->getData($this->getColumn()->getIndex());
32
- $xpayUrl = Mage::getModel("xpaymentsconnector/payment_cc")->getConfig("xpay_url")."admin.php?";
33
  $data = array('target'=>'payment', 'txnid'=>$txnid);
34
  $xpayQueryParam = http_build_query($data);
35
  $xpayQueryUrl = $xpayUrl.$xpayQueryParam;
29
  public function render(Varien_Object $row){
30
 
31
  $txnid = $row->getData($this->getColumn()->getIndex());
32
+ $xpayUrl = Mage::getModel('xpaymentsconnector/payment_cc')->getConfig('xpay_url').'admin.php?';
33
  $data = array('target'=>'payment', 'txnid'=>$txnid);
34
  $xpayQueryParam = http_build_query($data);
35
  $xpayQueryUrl = $xpayUrl.$xpayQueryParam;
app/code/community/Cdev/XPaymentsConnector/Block/Adminhtml/Sales/Order/View/Tab/Xporderstate.php CHANGED
@@ -80,19 +80,19 @@ class Cdev_XPaymentsConnector_Block_Adminhtml_Sales_Order_View_Tab_Xporderstate
80
  $result = array();
81
 
82
  if (empty($this->txnid) && empty($this->transactionInfo)) {
83
- $orderBroken = Mage::helper("xpaymentsconnector")->__("This order has been broken. Parameter 'xpayments transaction id' is not available.");
84
- $result["success"] = false;
85
- $result["error_message"] = $orderBroken;
86
  return $result;
87
  }
88
 
89
  if (!$this->transactionStatus || empty($this->transactionInfo)) {
90
- $xpaymentsConnect = Mage::helper("xpaymentsconnector")->__("Can't get information about the order from X-Payments server. More information is available in log files.");
91
- $result["success"] = false;
92
- $result["error_message"] = $xpaymentsConnect;
93
  } else {
94
- $result["success"] = true;
95
- $result["info"] = $this->transactionInfo;
96
  }
97
 
98
  return $result;
@@ -104,26 +104,26 @@ class Cdev_XPaymentsConnector_Block_Adminhtml_Sales_Order_View_Tab_Xporderstate
104
 
105
  $currentOrder = $this->getOrder();
106
  $currentPaymentCode = $currentOrder->getPayment()->getMethodInstance()->getCode();
107
- $isXpaymentsMethod = Mage::helper("xpaymentsconnector")->isXpaymentsMethod($currentPaymentCode);
108
  if($isXpaymentsMethod){
109
  if($this->txnid){
110
  list($this->transactionStatus, $this->transactionInfo[$currentOrder->getIncrementId()])
111
- = Mage::getModel("xpaymentsconnector/payment_cc")->requestPaymentInfo($this->txnid,false,true);
112
  if($this->transactionStatus){
113
- $this->transactionInfo[$currentOrder->getIncrementId()]["payment"]["xpc_txnid"] = $this->txnid;
114
  }
115
  }
116
 
117
  while(!is_null($parentOrder = $currentOrder->getRelationParentId())){
118
  $currentOrder = Mage::getModel('sales/order')->load($parentOrder);
119
  if ($currentOrder) {
120
- $txnid = $currentOrder->getData("xpc_txnid");
121
  if($txnid){
122
  list($transactionStatus, $transactionInfo)
123
- = Mage::getModel("xpaymentsconnector/payment_cc")->requestPaymentInfo($txnid, false, true);
124
  if ($transactionStatus) {
125
  $this->transactionInfo[$currentOrder->getIncrementId()] = $transactionInfo;
126
- $this->transactionInfo[$currentOrder->getIncrementId()]["payment"]["xpc_txnid"] = $txnid;
127
  }
128
  }
129
  }
@@ -142,14 +142,14 @@ class Cdev_XPaymentsConnector_Block_Adminhtml_Sales_Order_View_Tab_Xporderstate
142
  public function getCurrentActionAmount($xpOrderStateData){
143
  $actionAmount = 0.00;
144
  switch (true) {
145
- case ($xpOrderStateData["capturedAmountAvailGateway"] > 0 && $xpOrderStateData["refundedAmountAvailGateway"] < 0.01):
146
- $actionAmount = $xpOrderStateData["capturedAmountAvailGateway"];
147
  break;
148
- case ($xpOrderStateData["refundedAmountAvailGateway"] > 0 && $xpOrderStateData["capturedAmountAvailGateway"] < 0.01):
149
- $actionAmount = $xpOrderStateData["refundedAmountAvailGateway"];
150
  break;
151
- case ($actionAmount < 0.01 && $xpOrderStateData["chargedAmount"] > 0):
152
- $actionAmount = $xpOrderStateData["chargedAmount"];
153
  break;
154
  }
155
  return $actionAmount;
80
  $result = array();
81
 
82
  if (empty($this->txnid) && empty($this->transactionInfo)) {
83
+ $orderBroken = Mage::helper('xpaymentsconnector')->__("This order has been broken. Parameter 'xpayments transaction id' is not available.");
84
+ $result['success'] = false;
85
+ $result['error_message'] = $orderBroken;
86
  return $result;
87
  }
88
 
89
  if (!$this->transactionStatus || empty($this->transactionInfo)) {
90
+ $xpaymentsConnect = Mage::helper('xpaymentsconnector')->__("Can't get information about the order from X-Payments server. More information is available in log files.");
91
+ $result['success'] = false;
92
+ $result['error_message'] = $xpaymentsConnect;
93
  } else {
94
+ $result['success'] = true;
95
+ $result['info'] = $this->transactionInfo;
96
  }
97
 
98
  return $result;
104
 
105
  $currentOrder = $this->getOrder();
106
  $currentPaymentCode = $currentOrder->getPayment()->getMethodInstance()->getCode();
107
+ $isXpaymentsMethod = Mage::helper('xpaymentsconnector')->isXpaymentsMethod($currentPaymentCode);
108
  if($isXpaymentsMethod){
109
  if($this->txnid){
110
  list($this->transactionStatus, $this->transactionInfo[$currentOrder->getIncrementId()])
111
+ = Mage::getModel('xpaymentsconnector/payment_cc')->requestPaymentInfo($this->txnid,false,true);
112
  if($this->transactionStatus){
113
+ $this->transactionInfo[$currentOrder->getIncrementId()]['payment']['xpc_txnid'] = $this->txnid;
114
  }
115
  }
116
 
117
  while(!is_null($parentOrder = $currentOrder->getRelationParentId())){
118
  $currentOrder = Mage::getModel('sales/order')->load($parentOrder);
119
  if ($currentOrder) {
120
+ $txnid = $currentOrder->getData('xpc_txnid');
121
  if($txnid){
122
  list($transactionStatus, $transactionInfo)
123
+ = Mage::getModel('xpaymentsconnector/payment_cc')->requestPaymentInfo($txnid, false, true);
124
  if ($transactionStatus) {
125
  $this->transactionInfo[$currentOrder->getIncrementId()] = $transactionInfo;
126
+ $this->transactionInfo[$currentOrder->getIncrementId()]['payment']['xpc_txnid'] = $txnid;
127
  }
128
  }
129
  }
142
  public function getCurrentActionAmount($xpOrderStateData){
143
  $actionAmount = 0.00;
144
  switch (true) {
145
+ case ($xpOrderStateData['capturedAmountAvailGateway'] > 0 && $xpOrderStateData['refundedAmountAvailGateway'] < 0.01):
146
+ $actionAmount = $xpOrderStateData['capturedAmountAvailGateway'];
147
  break;
148
+ case ($xpOrderStateData['refundedAmountAvailGateway'] > 0 && $xpOrderStateData['capturedAmountAvailGateway'] < 0.01):
149
+ $actionAmount = $xpOrderStateData['refundedAmountAvailGateway'];
150
  break;
151
+ case ($actionAmount < 0.01 && $xpOrderStateData['chargedAmount'] > 0):
152
+ $actionAmount = $xpOrderStateData['chargedAmount'];
153
  break;
154
  }
155
  return $actionAmount;
app/code/community/Cdev/XPaymentsConnector/Block/Adminhtml/Usercards/Grid.php CHANGED
@@ -29,7 +29,7 @@ class Cdev_XPaymentsConnector_Block_Adminhtml_Usercards_Grid extends Mage_Adminh
29
  protected function _prepareCollection()
30
  {
31
  $collection = Mage::getResourceModel('xpaymentsconnector/usercards_collection')
32
- ->addFieldToFilter('user_id', $this->getRequest()->getParam("id"));
33
  $this->setCollection($collection);
34
  return parent::_prepareCollection();
35
  }
@@ -72,11 +72,11 @@ class Cdev_XPaymentsConnector_Block_Adminhtml_Usercards_Grid extends Mage_Adminh
72
 
73
  protected function _prepareColumns()
74
  {
75
- $collection = Mage::getModel("xpaymentsconnector/usercards")->getCollection()->addFieldToSelect('card_type')->distinct(true);
76
  $cardTypes = $collection->getColumnValues('card_type');
77
  $cardsTypeOptions = array_combine($cardTypes,$cardTypes);
78
 
79
- $cardUsageOptions = Mage::getModel("xpaymentsconnector/usercards")->getCardsUsageOptions();
80
 
81
  $this->addColumn('xp_card_id', array(
82
  'header' => Mage::helper('xpaymentsconnector')->__('Card id'),
29
  protected function _prepareCollection()
30
  {
31
  $collection = Mage::getResourceModel('xpaymentsconnector/usercards_collection')
32
+ ->addFieldToFilter('user_id', $this->getRequest()->getParam('id'));
33
  $this->setCollection($collection);
34
  return parent::_prepareCollection();
35
  }
72
 
73
  protected function _prepareColumns()
74
  {
75
+ $collection = Mage::getModel('xpaymentsconnector/usercards')->getCollection()->addFieldToSelect('card_type')->distinct(true);
76
  $cardTypes = $collection->getColumnValues('card_type');
77
  $cardsTypeOptions = array_combine($cardTypes,$cardTypes);
78
 
79
+ $cardUsageOptions = Mage::getModel('xpaymentsconnector/usercards')->getCardsUsageOptions();
80
 
81
  $this->addColumn('xp_card_id', array(
82
  'header' => Mage::helper('xpaymentsconnector')->__('Card id'),
app/code/community/Cdev/XPaymentsConnector/Block/Beforesuccess.php CHANGED
@@ -44,15 +44,15 @@ class Cdev_XPaymentsConnector_Block_Beforesuccess extends Mage_Core_Block_Templa
44
  }
45
 
46
  public function getSaveOrderUrl(){
47
- return Mage::getUrl("checkout/onepage/saveorder");
48
  }
49
 
50
  public function getCheckoutSuccessUrl(){
51
- return Mage::getUrl("checkout/onepage/success");
52
  }
53
 
54
  public function getXpaymentsCode(){
55
- $xpaymentPaymentCode = Mage::getModel("xpaymentsconnector/payment_cc")->getCode();
56
  return $xpaymentPaymentCode;
57
  }
58
 
44
  }
45
 
46
  public function getSaveOrderUrl(){
47
+ return Mage::getUrl('checkout/onepage/saveorder');
48
  }
49
 
50
  public function getCheckoutSuccessUrl(){
51
+ return Mage::getUrl('checkout/onepage/success');
52
  }
53
 
54
  public function getXpaymentsCode(){
55
+ $xpaymentPaymentCode = Mage::getModel('xpaymentsconnector/payment_cc')->getCode();
56
  return $xpaymentPaymentCode;
57
  }
58
 
app/code/community/Cdev/XPaymentsConnector/Block/Checkout/Onepage/Settings.php CHANGED
@@ -29,7 +29,7 @@ class Cdev_XPaymentsConnector_Block_Checkout_Onepage_Settings extends Mage_Core_
29
  public function isXpaymentMethod(){
30
 
31
  $paymentCode = Mage::getSingleton('checkout/session')->getQuote()->getPayment()->getMethodInstance()->getCode();
32
- $xpaymentPaymentCode = Mage::getModel("xpaymentsconnector/payment_cc")->getCode();
33
 
34
  if($paymentCode == $xpaymentPaymentCode){
35
  return true;
29
  public function isXpaymentMethod(){
30
 
31
  $paymentCode = Mage::getSingleton('checkout/session')->getQuote()->getPayment()->getMethodInstance()->getCode();
32
+ $xpaymentPaymentCode = Mage::getModel('xpaymentsconnector/payment_cc')->getCode();
33
 
34
  if($paymentCode == $xpaymentPaymentCode){
35
  return true;
app/code/community/Cdev/XPaymentsConnector/Block/Customer/Account/Navigation.php CHANGED
@@ -31,7 +31,7 @@ class Cdev_XPaymentsConnector_Block__Customer_Account_Navigation extends Mage_Cu
31
  {
32
  $IsSaveCardsPaymentActive = (bool)Mage::getStoreConfig('payment/savedcards/active');
33
  if (!$IsSaveCardsPaymentActive) {
34
- unset($this->_links["customer_usercards"]);
35
  }
36
  return $this;
37
  }
31
  {
32
  $IsSaveCardsPaymentActive = (bool)Mage::getStoreConfig('payment/savedcards/active');
33
  if (!$IsSaveCardsPaymentActive) {
34
+ unset($this->_links['customer_usercards']);
35
  }
36
  return $this;
37
  }
app/code/community/Cdev/XPaymentsConnector/Block/Customer/Cardadd.php CHANGED
@@ -45,22 +45,22 @@ class Cdev_XPaymentsConnector_Block_Customer_Cardadd extends Mage_Core_Block_Tem
45
  public function getAuthorizeIframeUrl(){
46
 
47
  // update standart iframe handshake request
48
- $refId = "authorization";
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
 
56
- $xpaymentFormData = Mage::helper('payment')->getMethodInstance("xpayments")->getFormFields();
57
- $xpaymentFormUrl = Mage::helper('payment')->getMethodInstance("xpayments")->getUrl();
58
  $api = Mage::getModel('xpaymentsconnector/payment_cc');
59
 
60
  $result = $api->sendIframeHandshakeRequest($updateSendData,$isCardAuthorizePayment = true);
61
 
62
  $iframeUrlDataArray = array('target' => $xpaymentFormData['target'], 'token' => $result['response']['token']);
63
- $iframeUrl = $xpaymentFormUrl . "?" . http_build_query($iframeUrlDataArray);
64
  return $iframeUrl;
65
  }
66
 
45
  public function getAuthorizeIframeUrl(){
46
 
47
  // update standart iframe handshake request
48
+ $refId = 'authorization';
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
 
56
+ $xpaymentFormData = Mage::helper('payment')->getMethodInstance('xpayments')->getFormFields();
57
+ $xpaymentFormUrl = Mage::helper('payment')->getMethodInstance('xpayments')->getUrl();
58
  $api = Mage::getModel('xpaymentsconnector/payment_cc');
59
 
60
  $result = $api->sendIframeHandshakeRequest($updateSendData,$isCardAuthorizePayment = true);
61
 
62
  $iframeUrlDataArray = array('target' => $xpaymentFormData['target'], 'token' => $result['response']['token']);
63
+ $iframeUrl = $xpaymentFormUrl . '?' . http_build_query($iframeUrlDataArray);
64
  return $iframeUrl;
65
  }
66
 
app/code/community/Cdev/XPaymentsConnector/Block/Customer/Usercards.php CHANGED
@@ -30,7 +30,7 @@ class Cdev_XPaymentsConnector_Block_Customer_Usercards extends Mage_Core_Block_T
30
  if($customer = Mage::getSingleton('customer/session')->isLoggedIn()) {
31
  $customerData = Mage::getSingleton('customer/session')->getCustomer();
32
  $customerId = $customerData->getId();
33
- $userCardsCollection = Mage::getModel("xpaymentsconnector/usercards")
34
  ->getCollection()
35
  ->addFilter('user_id',$customerId)
36
  ->addFilter('usage_type',Cdev_XPaymentsConnector_Model_Usercards::SIMPLE_CARD);
30
  if($customer = Mage::getSingleton('customer/session')->isLoggedIn()) {
31
  $customerData = Mage::getSingleton('customer/session')->getCustomer();
32
  $customerId = $customerData->getId();
33
+ $userCardsCollection = Mage::getModel('xpaymentsconnector/usercards')
34
  ->getCollection()
35
  ->addFilter('user_id',$customerId)
36
  ->addFilter('usage_type',Cdev_XPaymentsConnector_Model_Usercards::SIMPLE_CARD);
app/code/community/Cdev/XPaymentsConnector/Block/Form/Cc.php CHANGED
@@ -36,16 +36,16 @@ class Cdev_XPaymentsConnector_Block_Form_Cc extends Mage_Payment_Block_Form
36
  {
37
 
38
  $quotePayment = Mage::getSingleton('checkout/session')->getQuote()->getPayment();
39
- $isPaymentPlaceDisplayFlag = Mage::helper("xpaymentsconnector")->isIframePaymentPlaceDisplay();
40
- $methods = Mage::helper("xpaymentsconnector")->getAllowedPaymentsMethods();
41
  if ($quotePayment->getMethod()) {
42
  $currentPaymentMethodCode = $quotePayment->getMethodInstance()->getCode();
43
- $xpaymentPaymentCode = Mage::getModel("xpaymentsconnector/payment_cc")->getCode();
44
  if ($isPaymentPlaceDisplayFlag) {
45
  if ($currentPaymentMethodCode == $xpaymentPaymentCode) {
46
- $unsetParams = array("token");
47
- Mage::helper("xpaymentsconnector")->unsetXpaymentPrepareOrder($unsetParams);
48
- return Mage::helper("xpaymentsconnector")->getIframeUrl();
49
  }
50
  }
51
  }
@@ -53,17 +53,17 @@ class Cdev_XPaymentsConnector_Block_Form_Cc extends Mage_Payment_Block_Form
53
  if($methods && $isPaymentPlaceDisplayFlag){
54
  if(count($methods) == 1){
55
  $currentMethod = current($methods);
56
- $xpaymentPaymentCode = Mage::getModel("xpaymentsconnector/payment_cc")->getCode();
57
- if($currentMethod["method_code"] == $xpaymentPaymentCode){
58
- $unsetParams = array("token");
59
- Mage::helper("xpaymentsconnector")->unsetXpaymentPrepareOrder($unsetParams);
60
- return Mage::helper("xpaymentsconnector")->getIframeUrl();
61
  }
62
  }
63
  }
64
 
65
 
66
- return "#";
67
  }
68
 
69
  }
36
  {
37
 
38
  $quotePayment = Mage::getSingleton('checkout/session')->getQuote()->getPayment();
39
+ $isPaymentPlaceDisplayFlag = Mage::helper('xpaymentsconnector')->isIframePaymentPlaceDisplay();
40
+ $methods = Mage::helper('xpaymentsconnector')->getAllowedPaymentsMethods();
41
  if ($quotePayment->getMethod()) {
42
  $currentPaymentMethodCode = $quotePayment->getMethodInstance()->getCode();
43
+ $xpaymentPaymentCode = Mage::getModel('xpaymentsconnector/payment_cc')->getCode();
44
  if ($isPaymentPlaceDisplayFlag) {
45
  if ($currentPaymentMethodCode == $xpaymentPaymentCode) {
46
+ $unsetParams = array('token');
47
+ Mage::helper('xpaymentsconnector')->unsetXpaymentPrepareOrder($unsetParams);
48
+ return Mage::helper('xpaymentsconnector')->getIframeUrl();
49
  }
50
  }
51
  }
53
  if($methods && $isPaymentPlaceDisplayFlag){
54
  if(count($methods) == 1){
55
  $currentMethod = current($methods);
56
+ $xpaymentPaymentCode = Mage::getModel('xpaymentsconnector/payment_cc')->getCode();
57
+ if($currentMethod['method_code'] == $xpaymentPaymentCode){
58
+ $unsetParams = array('token');
59
+ Mage::helper('xpaymentsconnector')->unsetXpaymentPrepareOrder($unsetParams);
60
+ return Mage::helper('xpaymentsconnector')->getIframeUrl();
61
  }
62
  }
63
  }
64
 
65
 
66
+ return '#';
67
  }
68
 
69
  }
app/code/community/Cdev/XPaymentsConnector/Block/Form/Container.php CHANGED
@@ -25,7 +25,7 @@ class Cdev_XPaymentsConnector_Block_Form_Container extends Mage_Checkout_Block_O
25
  public function getMethods()
26
  {
27
  $methods = parent::getMethods();
28
- Mage::helper("xpaymentsconnector")->setAllowedPaymentsMethods($methods);
29
  return $methods;
30
 
31
  }
25
  public function getMethods()
26
  {
27
  $methods = parent::getMethods();
28
+ Mage::helper('xpaymentsconnector')->setAllowedPaymentsMethods($methods);
29
  return $methods;
30
 
31
  }
app/code/community/Cdev/XPaymentsConnector/Block/Form/Prepaidpayments.php CHANGED
@@ -34,9 +34,9 @@ class Cdev_XPaymentsConnector_Block_Form_Prepaidpayments extends Mage_Payment_Bl
34
 
35
  public function getAdminhtmlUserPrepaidCardsList(){
36
  $quote = Mage::getSingleton('adminhtml/session_quote')->getQuote();
37
- $customerId = $quote->getData("customer_id");
38
  if($customerId){
39
- $userBalanceCardsCollection = Mage::getModel("xpaymentsconnector/usercards")
40
  ->getCollection()
41
  ->addFilter('user_id',$customerId)
42
  ->addFilter('usage_type',Cdev_XPaymentsConnector_Model_Usercards::BALANCE_CARD);
34
 
35
  public function getAdminhtmlUserPrepaidCardsList(){
36
  $quote = Mage::getSingleton('adminhtml/session_quote')->getQuote();
37
+ $customerId = $quote->getData('customer_id');
38
  if($customerId){
39
+ $userBalanceCardsCollection = Mage::getModel('xpaymentsconnector/usercards')
40
  ->getCollection()
41
  ->addFilter('user_id',$customerId)
42
  ->addFilter('usage_type',Cdev_XPaymentsConnector_Model_Usercards::BALANCE_CARD);
app/code/community/Cdev/XPaymentsConnector/Block/Form/Savedcards.php CHANGED
@@ -36,7 +36,7 @@ class Cdev_XPaymentsConnector_Block_Form_Savedcards extends Mage_Payment_Block_F
36
  if($customer = Mage::getSingleton('customer/session')->isLoggedIn()) {
37
  $customerData = Mage::getSingleton('customer/session')->getCustomer();
38
  $customerId = $customerData->getId();
39
- $userCardsCollection = Mage::getModel("xpaymentsconnector/usercards")
40
  ->getCollection()
41
  ->addFilter('user_id',$customerId)
42
  ->addFilter('usage_type',Cdev_XPaymentsConnector_Model_Usercards::SIMPLE_CARD);
@@ -50,10 +50,10 @@ class Cdev_XPaymentsConnector_Block_Form_Savedcards extends Mage_Payment_Block_F
50
 
51
  public function getAdminhtmlUserCreditCardsList(){
52
  $quote = Mage::getSingleton('adminhtml/session_quote')->getQuote();
53
- $customerId = $quote->getData("customer_id");
54
 
55
  if($customerId){
56
- $userCardsCollection = Mage::getModel("xpaymentsconnector/usercards")
57
  ->getCollection()
58
  ->addFilter('user_id',$customerId)
59
  ->addFilter('usage_type',Cdev_XPaymentsConnector_Model_Usercards::SIMPLE_CARD);
36
  if($customer = Mage::getSingleton('customer/session')->isLoggedIn()) {
37
  $customerData = Mage::getSingleton('customer/session')->getCustomer();
38
  $customerId = $customerData->getId();
39
+ $userCardsCollection = Mage::getModel('xpaymentsconnector/usercards')
40
  ->getCollection()
41
  ->addFilter('user_id',$customerId)
42
  ->addFilter('usage_type',Cdev_XPaymentsConnector_Model_Usercards::SIMPLE_CARD);
50
 
51
  public function getAdminhtmlUserCreditCardsList(){
52
  $quote = Mage::getSingleton('adminhtml/session_quote')->getQuote();
53
+ $customerId = $quote->getData('customer_id');
54
 
55
  if($customerId){
56
+ $userCardsCollection = Mage::getModel('xpaymentsconnector/usercards')
57
  ->getCollection()
58
  ->addFilter('user_id',$customerId)
59
  ->addFilter('usage_type',Cdev_XPaymentsConnector_Model_Usercards::SIMPLE_CARD);
app/code/community/Cdev/XPaymentsConnector/Block/Recurring/Profile/View.php CHANGED
@@ -30,19 +30,19 @@ class Cdev_XPaymentsConnector_Block_Recurring_Profile_View extends Mage_Sales_Bl
30
  public function prepareFeesInfo()
31
  {
32
  parent::prepareFeesInfo();
33
- $orderItemInfo = $this->_profile->getData("order_item_info");
34
- $discountAmount = $orderItemInfo["discount_amount"];
35
  if($discountAmount){
36
- $discountNominalModel = Mage::getModel("xpaymentsconnector/quote_address_total_nominal_recurring_discount");
37
  $this->_addInfo(array(
38
  'label' => $discountNominalModel->getLabel(),
39
  'value' => Mage::helper('core')->formatCurrency(-$discountAmount, false),
40
  'is_amount' => true,
41
  ));
42
  }
43
- $initialFeeTaxAmount = $orderItemInfo["initialfee_tax_amount"];
44
  if($initialFeeTaxAmount){
45
- $initialFeeTaxNominalModel = Mage::getModel("xpaymentsconnector/quote_address_total_nominal_recurring_initialfee_tax");
46
  $this->_addInfo(array(
47
  'label' => $initialFeeTaxNominalModel->getLabel(),
48
  'value' => Mage::helper('core')->formatCurrency($initialFeeTaxAmount, false),
30
  public function prepareFeesInfo()
31
  {
32
  parent::prepareFeesInfo();
33
+ $orderItemInfo = $this->_profile->getData('order_item_info');
34
+ $discountAmount = $orderItemInfo['discount_amount'];
35
  if($discountAmount){
36
+ $discountNominalModel = Mage::getModel('xpaymentsconnector/quote_address_total_nominal_recurring_discount');
37
  $this->_addInfo(array(
38
  'label' => $discountNominalModel->getLabel(),
39
  'value' => Mage::helper('core')->formatCurrency(-$discountAmount, false),
40
  'is_amount' => true,
41
  ));
42
  }
43
+ $initialFeeTaxAmount = $orderItemInfo['initialfee_tax_amount'];
44
  if($initialFeeTaxAmount){
45
+ $initialFeeTaxNominalModel = Mage::getModel('xpaymentsconnector/quote_address_total_nominal_recurring_initialfee_tax');
46
  $this->_addInfo(array(
47
  'label' => $initialFeeTaxNominalModel->getLabel(),
48
  'value' => Mage::helper('core')->formatCurrency($initialFeeTaxAmount, false),
app/code/community/Cdev/XPaymentsConnector/Block/Redirect.php CHANGED
@@ -79,7 +79,7 @@ class Cdev_XPaymentsConnector_Block_Redirect extends Mage_Core_Block_Template
79
  public function getFormAction()
80
  {
81
  if(is_null($this->paymentMethod)){
82
- $this->paymentMethod = Mage::getModel("xpaymentsconnector/payment_cc");
83
  }
84
 
85
  return $this->paymentMethod->getUrl();
@@ -96,7 +96,7 @@ class Cdev_XPaymentsConnector_Block_Redirect extends Mage_Core_Block_Template
96
  public function getFormData()
97
  {
98
  if(is_null($this->paymentMethod)){
99
- $this->paymentMethod = Mage::getModel("xpaymentsconnector/payment_cc");
100
  }
101
  return $this->paymentMethod->getFormFields();
102
  }
79
  public function getFormAction()
80
  {
81
  if(is_null($this->paymentMethod)){
82
+ $this->paymentMethod = Mage::getModel('xpaymentsconnector/payment_cc');
83
  }
84
 
85
  return $this->paymentMethod->getUrl();
96
  public function getFormData()
97
  {
98
  if(is_null($this->paymentMethod)){
99
+ $this->paymentMethod = Mage::getModel('xpaymentsconnector/payment_cc');
100
  }
101
  return $this->paymentMethod->getFormFields();
102
  }
app/code/community/Cdev/XPaymentsConnector/Model/Quote/Address/Total/Nominal/Recurring/Discount.php CHANGED
@@ -42,4 +42,18 @@ class Cdev_XPaymentsConnector_Model_Quote_Address_Total_Nominal_Recurring_Discou
42
  {
43
  return Mage::helper('sales')->__('Discount');
44
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
45
  }
42
  {
43
  return Mage::helper('sales')->__('Discount');
44
  }
45
+
46
+ /**
47
+ * Getter for row default total
48
+ *
49
+ * @param Mage_Sales_Model_Quote_Item_Abstract $item
50
+ * @return float
51
+ */
52
+ public function getItemRowTotal(Mage_Sales_Model_Quote_Item_Abstract $item)
53
+ {
54
+ $discountAmount = $item->getDiscountAmount();
55
+ if (!is_null($discountAmount) && !empty($discountAmount)) {
56
+ return $discountAmount;
57
+ }
58
+ }
59
  }
app/design/frontend/default/default/layout/xpaymentsconnector.xml CHANGED
@@ -22,6 +22,16 @@
22
  -->
23
  <layout version="1.0.0">
24
 
 
 
 
 
 
 
 
 
 
 
25
  <checkout_onepage_index translate="label">
26
  <reference name="head">
27
  <block type="core/text" name="google.jquery">
22
  -->
23
  <layout version="1.0.0">
24
 
25
+ <checkout_cart_index translate="label">
26
+ <reference name="head">
27
+ <action method="addItem">
28
+ <type>js_css</type>
29
+ <name>xpayment/settings.css</name>
30
+ <params/>
31
+ </action>
32
+ </reference>
33
+ </checkout_cart_index>
34
+
35
  <checkout_onepage_index translate="label">
36
  <reference name="head">
37
  <block type="core/text" name="google.jquery">
app/design/frontend/rwd/default/layout/xpaymentsconnector.xml CHANGED
@@ -22,6 +22,16 @@
22
  -->
23
  <layout version="1.0.0">
24
 
 
 
 
 
 
 
 
 
 
 
25
  <checkout_onepage_index translate="label">
26
  <reference name="head">
27
  <block type="core/text" name="google.jquery">
22
  -->
23
  <layout version="1.0.0">
24
 
25
+ <checkout_cart_index translate="label">
26
+ <reference name="head">
27
+ <action method="addItem">
28
+ <type>js_css</type>
29
+ <name>xpayment/settings.css</name>
30
+ <params/>
31
+ </action>
32
+ </reference>
33
+ </checkout_cart_index>
34
+
35
  <checkout_onepage_index translate="label">
36
  <reference name="head">
37
  <block type="core/text" name="google.jquery">
js/xpayment/settings.css CHANGED
@@ -411,9 +411,7 @@ iframe .buttonRow {
411
 
412
  }
413
 
414
-
415
-
416
- /*admin cards list*/
417
 
418
  #customer_edit_tab_usercards_table td{
419
  text-align: center;
@@ -442,7 +440,7 @@ iframe .buttonRow {
442
  height: 260px;
443
  }
444
 
445
- /*end (xp transaction form)*/
446
  .xp_fast_transactions input {
447
  max-width: 170px;
448
  margin: 5px;
@@ -461,4 +459,10 @@ iframe .buttonRow {
461
 
462
  #recurring-detail-block li {
463
  margin-left: 15px;
464
- }
 
 
 
 
 
 
411
 
412
  }
413
 
414
+ /* admin cards list */
 
 
415
 
416
  #customer_edit_tab_usercards_table td{
417
  text-align: center;
440
  height: 260px;
441
  }
442
 
443
+ /* xp transaction form */
444
  .xp_fast_transactions input {
445
  max-width: 170px;
446
  margin: 5px;
459
 
460
  #recurring-detail-block li {
461
  margin-left: 15px;
462
+ }
463
+
464
+ /* checkout cart page */
465
+ #shopping-cart-totals-table tr td:last-child {
466
+ white-space: nowrap
467
+ }
468
+ /* end (checkout cart page) */
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>CDev_XPaymentsConnector</name>
4
- <version>1.3.2</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.3.2</notes>
14
  <authors><author><name>Valerii Demidov</name><user>Valerii</user><email>vdemidov@corp.web4pro.com.ua</email></author></authors>
15
- <date>2015-02-05</date>
16
- <time>16:29:40</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="13d4ed0d24df35cc9956dc155b3ce8b5"/></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="907a1e3917994e5cf5d70b8cb7ebbc18"/></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="ba4e515d5e9342b11d63dc796aa96e8a"/></dir></dir><file name="Beforesuccess.php" hash="60a7d25651a98f71ca67ed70380e1659"/><file name="Cancel.php" hash="3283657e21047278d81ac4478ac81de6"/><dir name="Checkout"><dir name="Onepage"><file name="Orderdetail.php" hash="4073d0b05c272cf3ad4c29da2a5f763f"/><file name="Settings.php" hash="cb6c6eac7712be2889b03a9762db25b6"/></dir></dir><file name="Control.php" hash="e0ef77a236030598882937acb2a9c4e0"/><dir name="Customer"><dir name="Account"><file name="Navigation.php" hash="aad9aa09d20706f042f1deac00d04473"/></dir><file name="Cardadd.php" hash="d46b80f3ee05cc46faf3d74b589baafa"/><file name="Success.php" hash="54f243e60b735cdd5cd879be65838fee"/><file name="Usercards.php" hash="ce4b7f73fb735a55d914ba0dad38d68a"/></dir><file name="Failure.php" hash="537aec3d3ee63ff1ac2d2300c2ca259e"/><dir name="Form"><file name="Cc.php" hash="e66f4a72b6ef02cdec8c45522a171568"/><file name="Container.php" hash="f5b3fd1fbf43eee8a6036a2a3a0bd5f7"/><file name="Prepaidpayments.php" hash="66959c7b8e7714f80f44da9afde93936"/><file name="Savedcards.php" hash="552579e7918fc666dc6de8983fc185b3"/></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="d795b6e5ef5df912faa5537f38c5eb4b"/></dir></dir><file name="Redirect.php" hash="e4745b70dbe2d33b327a70eb195c9345"/><file name="Success.php" hash="d2f023bc2206cbb33997b791a57b1b4e"/></dir><dir name="Helper"><file name="Data.php" hash="de79f088a435cc4f218e6863bf8c24bf"/></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="e52b47f0595ebca44a7682f0f713b07f"/><dir name="Payment"><file name="Cc.php" hash="e720e622005780b4b6cdc20edc08a64a"/><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="9c2ee0abac22865bb349dc11cebd66b2"/><dir name="Initialfee"><file name="Tax.php" hash="892804e777f2e1bba1e57cd03d96e5b2"/></dir></dir></dir><file name="Nominal.php" hash="1f57e688dbd2fa26fd1c3c18a830bc04"/></dir></dir></dir><file name="Quote.php" hash="9ddf19dfd97cbbe6423e80207f81a42f"/><dir name="Sales"><dir name="Recurring"><file name="Profile.php" hash="2d2333a03534938f1823a9031cfbbf10"/></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="230df2cf7ff6ddb13b60bde95148c6c9"/></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="97340916013f0bb3dfc72deeac4891d3"/></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="466423a77fc9a97e1f4db15b9f1650f8"/><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="f4bd2aa628257cb1f3450a1632a0b771"/><file name="savedcards.phtml" hash="b44b31ecdf8c653ea8299c9664061b27"/></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="97340916013f0bb3dfc72deeac4891d3"/></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="466423a77fc9a97e1f4db15b9f1650f8"/><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="f4bd2aa628257cb1f3450a1632a0b771"/><file name="savedcards.phtml" hash="b44b31ecdf8c653ea8299c9664061b27"/></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="529b0402ad92803278f6b7f81399e47d"/></dir></dir></target><target name="magelocale"><dir><dir name="en_US"><file name="Cdev_XPaymentsConnector.csv" hash="2f7c72d8648f87d11ce9a969e38a8676"/></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.3.3</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.3.3</notes>
14
  <authors><author><name>Valerii Demidov</name><user>Valerii</user><email>vdemidov@corp.web4pro.com.ua</email></author></authors>
15
+ <date>2015-02-16</date>
16
+ <time>16:19:16</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="4073d0b05c272cf3ad4c29da2a5f763f"/><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="de79f088a435cc4f218e6863bf8c24bf"/></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="e52b47f0595ebca44a7682f0f713b07f"/><dir name="Payment"><file name="Cc.php" hash="e720e622005780b4b6cdc20edc08a64a"/><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="1f57e688dbd2fa26fd1c3c18a830bc04"/></dir></dir></dir><file name="Quote.php" hash="9ddf19dfd97cbbe6423e80207f81a42f"/><dir name="Sales"><dir name="Recurring"><file name="Profile.php" hash="2d2333a03534938f1823a9031cfbbf10"/></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="230df2cf7ff6ddb13b60bde95148c6c9"/></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="466423a77fc9a97e1f4db15b9f1650f8"/><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="f4bd2aa628257cb1f3450a1632a0b771"/><file name="savedcards.phtml" hash="b44b31ecdf8c653ea8299c9664061b27"/></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="466423a77fc9a97e1f4db15b9f1650f8"/><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="f4bd2aa628257cb1f3450a1632a0b771"/><file name="savedcards.phtml" hash="b44b31ecdf8c653ea8299c9664061b27"/></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="2f7c72d8648f87d11ce9a969e38a8676"/></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>