Merge pull request #36 from zipMoney/feature/remove_product_selector-IN-912

Remove Product Selector from admin

Author: webgig

Model/Config.php

@@ -146,7 +146,7 @@ class Config implements ConfigInterface
    *
    * @const
    */
-  const PAYMENT_METHOD_LOGO_ZIP = "https://static.zipmoney.com.au/logo/25px/";
+  const PAYMENT_METHOD_LOGO_ZIP = "https://static.zipmoney.com.au/logo/25px/zip.png";
 
   /**
    * Error Codes Map
@@ -295,18 +295,10 @@ public function getEnvironment()
    */
   public function getMethodLogo()
   {
-    return  self::PAYMENT_METHOD_LOGO_ZIP.strtolower($this->getProduct()).".png";
+    return  self::PAYMENT_METHOD_LOGO_ZIP;
   }
 
-  /**
-   * Returns Product
-   *
-   * @return string
-   */
-  public function getProduct()
-  {
-    return $this->getConfigData(self::PAYMENT_ZIPMONEY_PRODUCT);
-  }
+  
 
   /**
    * Check if in-context checkout is active
@@ -477,7 +469,7 @@ public function setStoreId($storeId)
    */
   public function getPaymentAcceptanceMarkSrc()
   {
-    return self::PAYMENT_METHOD_LOGO_ZIP.$this->getProduct().".png";
+    return self::PAYMENT_METHOD_LOGO_ZIP;
   }
 
    /**

Model/Config/Source/Product.php

@@ -89,7 +89,6 @@ public function getConfig()
                                    "checkoutUri"  => $this->_config->getCheckoutUrl(), 
                                    "redirectUri"  => $this->_config->getRedirectUrl(), 
                                    "environment"  => $this->_config->getEnvironment(),
-                                   "product"  => $this->_config->getProduct(),
                                    "title"  => $this->_config->getTitle(),
                                    "inContextCheckoutEnabled"  => (bool)$this->_config->isInContextCheckout()
                                   ];

Model/Ui/ConfigProvider.php

@@ -34,10 +34,6 @@
                     <label>Merchant Public Key</label>                    
                     <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
                 </field>
-                <field id="product" translate="label" type="select" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="0">
-                    <label>Product Type</label>                        
-                    <source_model>ZipMoney\ZipMoneyPayment\Model\Config\Source\Product</source_model>
-                </field>
                 <field id="payment_action" translate="label" type="select" sortOrder="6" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>Payment Action</label>                        
                     <source_model>ZipMoney\ZipMoneyPayment\Model\Config\Source\PaymentAction</source_model>

etc/adminhtml/system.xml

@@ -76,7 +76,6 @@ define(
             }, 
             getContinueText:function(){
                 return "Continue";
-                //window.checkoutConfig.payment.zipmoneypayment.product == "zipPay" ? "Continue to zipPay" : "Continue to zipMoney";
             },
             getCode: function() {
                 return window.checkoutConfig.payment.zipmoneypayment.code;

view/frontend/web/js/view/payment/method-renderer/zipmoney-zipmoneypayment.js

@@ -6,7 +6,7 @@
                data-bind="attr: {'id': getCode()}, value: getCode(), checked: isChecked, click: selectPaymentMethod, visible: isRadioButtonVisible()"/>
         <label data-bind="attr: {'for': getCode()}" class="label">
             <!-- zipMoney Logo -->
-            <img style="width:90px" data-bind="attr: {src: getPaymentAcceptanceMarkSrc(), alt: $t('zipMoney Acceptance Mark')}"
+            <img style="height:26px" data-bind="attr: {src: getPaymentAcceptanceMarkSrc(), alt: $t('zipMoney Acceptance Mark')}"
                  class="payment-icon"/>
             <!-- zipMoney Logo -->
             <span data-bind="text: getTitle()"></span>