Merge branch 'release/2.3.0'

SnowdogApps · Jul 3, 2020 · 7424c68 · 7424c68
2 parents 73b8ec5 + 4814778
commit 7424c68
Show file tree

Hide file tree

Showing 111 changed files with 3,577 additions and 675 deletions.
diff --git a/Amasty_GiftCard/requirejs-config.js b/Amasty_GiftCard/requirejs-config.js
@@ -0,0 +1,7 @@
+var config = {
+  map: {
+    "*": {
+      "amastyGiftCardMain": "Amasty_GiftCard/js/main",
+    }
+  }
+};
diff --git a/Amasty_GiftCard/templates/product/view/type/giftcard.phtml b/Amasty_GiftCard/templates/product/view/type/giftcard.phtml
@@ -6,6 +6,12 @@
     <div
         class="fieldset"
         data-amgiftcard-js="amgiftcard-fieldset"
+        data-mage-init='{ "amastyGiftCardMain": {
+            "productId": "<?= $_product->getId(); ?>",
+            "feeType": "<?= $_product->getAmGiftcardFeeType(); ?>",
+            "feeValue": "<?= $block->getFeeAmount(); ?>"
+          }
+        }'
     >
         <?php if ($block->isMultiAmount() || $_product->getAmGiftcardPrices()) : ?>
             <div class="field required">
@@ -390,16 +396,9 @@
         <script>
             require([
                 'jquery',
-                'Amasty_GiftCard/js/main',
                 "mage/calendar",
                 "mage/tooltip"
             ], function ($) {
-                $('[data-amgiftcard-js="amgiftcard-fieldset"]').amGiftcard({
-                    productId: "<?= $_product->getId(); ?>",
-                    feeType: "<?= $_product->getAmGiftcardFeeType(); ?>",
-                    feeValue: "<?= $block->getFeeAmount(); ?>"
-                });
-
                 if ($('[data-amgiftcard-js="amgiftcard-delivery-date"]')) {
                     $('[data-amgiftcard-js="amgiftcard-delivery-date"]').calendar({
                         showTime: false,

diff --git a/Amazon_Payment/web/template/form/element/email.html b/Amazon_Payment/web/template/form/element/email.html
@@ -0,0 +1,119 @@
+<!-- ko foreach: getRegion('amazon-button-region') -->
+<!-- ko template: getTemplate() --><!-- /ko -->
+<!-- /ko -->
+
+<!-- ko ifnot: isCustomerLoggedIn() -->
+
+<!-- ko foreach: getRegion('before-login-form') -->
+<!-- ko template: getTemplate() --><!-- /ko -->
+<!-- /ko -->
+<form
+    class="form form-login"
+    data-role="email-with-possible-login"
+    data-bind="submit:login"
+    method="post"
+>
+    <fieldset
+        id="customer-email-fieldset"
+        class="fieldset"
+        data-bind="blockLoader: isLoading"
+    >
+        <div class="field required">
+            <label
+                class="label"
+                for="customer-email"
+            >
+                <span data-bind="i18n: 'Email Address'"></span>
+            </label>
+            <div class="control _with-tooltip">
+                <input
+                    class="input-text"
+                    type="email"
+                    data-bind="
+                        textInput: email,
+                        hasFocus: emailFocused"
+                    name="username"
+                    data-validate="{required:true, 'validate-email':true}"
+                    id="customer-email"
+                />
+                <!-- ko template: 'ui/form/element/helper/tooltip' --><!-- /ko -->
+                <span
+                    class="note"
+                    data-bind="fadeVisible: isPasswordVisible() == false"
+                >
+                    <!-- ko i18n: 'You can create an account after checkout.'--><!-- /ko -->
+                </span>
+            </div>
+        </div>
+
+        <!--Hidden fields -->
+        <fieldset
+            class="fieldset hidden-fields"
+            data-bind="fadeVisible: isPasswordVisible"
+        >
+            <div class="field">
+                <label
+                    class="label"
+                    for="customer-password"
+                >
+                    <span data-bind="i18n: 'Password'"></span>
+                </label>
+                <div class="control">
+                    <input
+                        class="input-text"
+                        placeholder="optional"
+                        type="password"
+                        name="password"
+                        id="customer-password"
+                        data-validate="{required:true}"
+                        autocomplete="off"
+                    />
+                    <span
+                        class="note"
+                        data-bind="i18n: 'You already have an account with us. Sign in or continue as guest.'"
+                    ></span>
+                </div>
+
+            </div>
+            <!-- ko foreach: getRegion('additional-login-form-fields') -->
+            <!-- ko template: getTemplate() --><!-- /ko -->
+            <!-- /ko -->
+            <div
+                class="
+                    login-buttons
+                    shipping-address__login-buttons
+                "
+            >
+                <input
+                    name="context"
+                    type="hidden"
+                    value="checkout"
+                />
+                <button
+                    type="submit"
+                    class="
+                        action
+                        login
+                        primary
+                        shipping-address__btn-login
+                    "
+                    data-action="checkout-method-login"
+                >
+                    <span data-bind="i18n: 'Login'"></span>
+                </button>
+                <a
+                    class="
+                        action
+                        remind
+                        shipping-address__btn-remind
+                    "
+                    data-bind="attr: { href: forgotPasswordUrl }"
+                >
+                    <span data-bind="i18n: 'Forgot Your Password?'"></span>
+                </a>
+            </div>
+        </fieldset>
+        <!--Hidden fields -->
+    </fieldset>
+</form>
+<!-- /ko -->