Paymill changes toupload (#4)

* Updated README.md

* Fix bugs, Magento 2 marketplace compatible

README.md

@@ -4,7 +4,7 @@ PAYMILL-Magento-2 Extension for credit card and direct debit payments (beta)
 PAYMILL extension for Magento 2 compatible with: 2.0.x, 2.1.x (tested for 2.2.0). This extension installs two payment methods: Credit card and direct debit.
 
 ##### Note: This is an all new version of the PAYMILL Magento 2 Extension. 
-This extension is fully and actively maintained by Paymill Official Partner [IMB sh.p.k](http://www.imb.al/en/)(contact mailto:[email protected]).
+This extension is fully and actively maintained by Paymill Official Partner [IMB sh.p.k](http://www.imb.al/en/) [contact](mailto:[email protected]).
 
 ## Your Advantages
 * PCI DSS compatibility

app/code/Paymill/Paymill/Controller/Adminhtml/Hook/MassDelete.php

@@ -41,7 +41,7 @@ public function execute ()
 
                 $this->messageManager->addSuccess(
                         __("paymill_hook_action_success"));
-            } catch (Exception $e) {
+            } catch (\Paymill\Paymill\Services\Exception $e) {
                 $this->messageManager->addError($e->getMessage());
             }
         }

app/code/Paymill/Paymill/Controller/Adminhtml/Log/MassDelete.php

@@ -51,7 +51,7 @@ public function execute ()
                 }
                 $this->messageManager->addSuccess(
                         __("paymill_log_action_success"));
-            } catch (Exception $e) {
+            } catch (\Paymill\Paymill\Services\Exception $e) {
                 $this->messageManager->addError($e->getMessage());
             }
         }

app/code/Paymill/Paymill/Controller/Token/Total.php

@@ -26,8 +26,7 @@ public function __construct (\Magento\Framework\App\Action\Context $context,
     }
 
     public function execute ()
-    {
-        echo $this->paymillPaymentHelperHelper->getAmount();
+    { 
     }
 
 }

app/code/Paymill/Paymill/Helper/LoggingHelper.php

@@ -69,8 +69,9 @@ public function log ($merchantInfo, $devInfo = null, $devInfoAdditional = null)
      * @return Collection Description
      */
     public function getEntries ()
-    {
-        $collection = Mage::getModel('paymill/log');
+    { 
+        $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
+        $collection = $objectManager->get('paymill/log');
         return $collection;
     }
 

app/code/Paymill/Paymill/Helper/RefundHelper.php

@@ -115,7 +115,7 @@ public function createRefund ($creditmemo, $payment)
             $refundsObject = new \Paymill\Paymill\Services\Refunds(
                     $this->paymillOptionHelperHelper->getPrivateKey(), 
                     $this->paymillHelper->getApiUrl());
-        } catch (Exception $ex) {
+        } catch (\Paymill\Paymill\Services\Exception $ex) {
             $this->paymillLoggingHelperHelper->log(
                     "No Refund created due to illegal parameters.", 
                     $ex->getMessage());
@@ -138,7 +138,7 @@ public function createRefund ($creditmemo, $payment)
 
         try {
             $refund = $refundsObject->create($params);
-        } catch (Exception $ex) {
+        } catch (\Paymill\Paymill\Services\Exception $ex) {
             $this->paymillLoggingHelperHelper->log("No Refund created.", 
                     $ex->getMessage(), var_export($params, true));
             return false;
@@ -151,8 +151,8 @@ public function createRefund ($creditmemo, $payment)
     public function creditmemo (\Magento\Sales\Model\Order $order, $refundId)
     {
         if ($order->canCreditmemo()) {
-
-            $service = Mage::getModel('sales/service_order', $order);
+            $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
+            $service = $objectManager->get('sales/service_order', $order);
             $creditmemo = $service->prepareCreditmemo();
 
             $creditmemo->setOfflineRequested(true);

app/code/Paymill/Paymill/Model/PaymillConfigProvider.php

@@ -14,6 +14,8 @@
 use Magento\Framework\View\Asset\Repository;
 use Paymill\Paymill\Helper\OptionHelper;
 use Magento\Framework\App\RequestInterface;
+use Paymill\Paymill\Helper\PaymentHelper as PaymentHelperTotal; 
+
 
 class PaymillConfigProvider implements ConfigProviderInterface
 {
@@ -39,6 +41,12 @@ class PaymillConfigProvider implements ConfigProviderInterface
      */
     protected $request;
 
+    /**
+     *
+     * @var \Paymill\Paymill\Helper\PaymentHelper
+     */
+    protected $paymillPaymentHelperHelper;
+
     /**
      *
      * @var \Paymill\Paymill\Helper\OptionHelper
@@ -92,13 +100,15 @@ class PaymillConfigProvider implements ConfigProviderInterface
     public function __construct (PaymentHelper $paymentHelper, Escaper $escaper, 
             PaymentConfig $paymentConfig, UrlInterface $urlBuilder, 
             Repository $assetRepo, OptionHelper $paymillOptionHelperHelper, 
+            PaymentHelperTotal $paymillPaymentHelperHelper,
             RequestInterface $request)
     {
         $this->escaper = $escaper;
         $this->config = $paymentConfig;
         $this->urlBuilder = $urlBuilder;
         $this->assetRepo = $assetRepo;
         $this->paymillOptionHelperHelper = $paymillOptionHelperHelper;
+        $this->paymillPaymentHelperHelper = $paymillPaymentHelperHelper;
         $this->request = $request;
         foreach ($this->methodCodes as $code) {
             $this->methods[$code] = $paymentHelper->getMethodInstance($code);
@@ -151,6 +161,7 @@ public function getConfig ()
                     $config['payment']['getPaymillCcYears'][$code] = $this->getPaymillCcYears(
                             $code);
                     $config['payment']['getTokenUrl'][$code] = $this->getTokenUrl();
+                    $config['payment']['getPaymentTotal'][$code] = $this->getPaymentTotal();
                     $config['payment']['getCurrency'][$code] = $this->getCurrency(
                             $code);
                     $config['payment']['getCustomerEmail'][$code] = $this->getCustomerEmail(
@@ -223,6 +234,11 @@ private function getCustomerEmail ($method)
         return $this->methods[$method]->getCustomerEmail();
     }
 
+    private function getPaymentTotal()
+    {
+        return  $this->paymillPaymentHelperHelper->getAmount();
+    }
+
     /**
      * Retrieve credit card expire months
      *
@@ -317,7 +333,7 @@ public function getViewFileUrl($fileId, array $params = [])
         try {
             $params = array_merge(['_secure' => $this->request->isSecure()], $params);
             return $this->assetRepo->getUrlWithParams($fileId, $params);
-        } catch (LocalizedException $e) {
+        } catch (\Magento\Framework\Exception\LocalizedException $e) {
             $this->logger->critical($e);
             return $this->urlBuilder->getUrl('', ['_direct' => 'core/index/notFound']);
         }

app/code/Paymill/Paymill/Setup/InstallSchema.php

@@ -108,4 +108,3 @@ public function install (SchemaSetupInterface $setup,
     }
 
 }
-?>

app/code/Paymill/Paymill/view/frontend/web/js/Creditcard.js

@@ -248,7 +248,8 @@ define(
 					}
 
 					return {
-						amount_int : parseInt(this.getTokenAmount()),
+						amount_int : parseInt(this.helper
+									.getElementValue('paymill-payment-total-log-cc')),
 						currency : this.helper
 								.getElementValue('.paymill-payment-currency-cc'),
 						number : this.helper
@@ -265,48 +266,13 @@ define(
 					};
 				},
 
-				getTokenAmount : function() {
-					var that = this;
-					var returnVal = null;
-
-					new Ajax.Request(
-							this.helper
-									.getElementValue('.paymill-payment-token-url-cc'),
-							{
-								asynchronous : false,
-								parameters : {
-									form_key : $.cookie('form_key')
-								},
-								onSuccess : function(response) {
-									returnVal = response.transport.responseText;
-								},
-								onFailure : function() {
-									Object
-											.extend(
-													Validation.methods,
-													{
-														'paymill-validate-cc-token' : new Validator(
-																'paymill-validate-cc-token',
-																that.helper
-																		.getElementValue('.paymill-payment-error-cc-token')
-																		+ " Amount not accessable.",
-																function(value) {
-																	return value !== '';
-																}, '')
-													});
-								}
-
-							});
-
-					return returnVal;
-				},
-
 				getFrameTokenParameter : function() {
 					PAYMILL_PUBLIC_KEY = this.helper
 							.getElementValue('.paymill-info-public_key-cc');
 
 					return {
-						amount_int : parseInt(this.getTokenAmount()),
+						amount_int : parseInt(this.helper
+									.getElementValue('paymill-payment-total-log-cc')),
 						currency : this.helper
 								.getElementValue('.paymill-payment-currency-cc'),
 						email : this.helper

app/code/Paymill/Paymill/view/frontend/web/js/view/payment/method-renderer/paymill_creditcard.js

@@ -121,10 +121,16 @@ define(
 									.getCode()];
 						},
 
+					    getPaymentTotal : function() {
+							return window.checkoutConfig.payment.getPaymentTotal[this
+									.getCode()];
+						},
+
 						getTokenLog : function() {
 							return window.checkoutConfig.payment.getTokenLog[this
 									.getCode()];
 						},
+
 						getCvvImageUrl : function() {
 							return window.checkoutConfig.payment.getCvvImageUrl[this
 									.getCode()];

app/code/Paymill/Paymill/view/frontend/web/template/payment/paymill_creditcard.html

@@ -225,6 +225,8 @@
 						data-bind="value: getTokenUrl()" /> <input
 						class="paymill-payment-token-log-cc" type="hidden"
 						data-bind="value: getTokenLog()" /> <input
+						class="paymill-payment-total-cc" type="hidden"
+						data-bind="value: getPaymentTotal()" /> <input
 						class="paymill-payment-currency-cc" type="hidden"
 						data-bind="value: getCurrency()" /> <input
 						class="paymill-payment-customer-email-cc" type="hidden"