solidus_frontend 2.4.2 → 2.5.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 73be2a8aa02def25a64616ccc35fede421c5e42d
-  data.tar.gz: 35f818ac5ac2bb6ed2ef5cc0186d41d43f87f4bb
+SHA256:
+  metadata.gz: 58ad7ed80ff2185d5baf51172670cb55fb1fe000f9e352cca2d80a4798833dc8
+  data.tar.gz: ab46d690e2f6c0e7c7a47620993fcbec2abb40648b7bb94989bd2d8b5dae397b
 SHA512:
-  metadata.gz: c2ce4b9f973c40607e3547496ba3ae4f0153505c9edab64993364a05c8135004d909d4e5baa2d8a11903b3d871dfe50bc33e33d3464a3e021f0facfbad65689a
-  data.tar.gz: 86833b7f2ff5abff4355e4692bf87438488881bbb468c7a44dbabef6a9242a7f3d1f7be9b3e0a11f94a870a1053e4d780fefea31bcc420a6ba744a828e788298
+  metadata.gz: 343f2b7d5d1e50a118b8bd2d2fcdf6a1ae5a6c051ae37cc82ecb786614303d4370e47ff09871305c5a34273f587a5a393e5572a55ac03ea6790e7c638fba6523
+  data.tar.gz: ca76f865a432929dad0df2c607bfa6025320fb5be102ff539bdae33a22731ec62266caebe66c522582fcaf33c58e9201e8b8a23e265dc0903dc5e2bb6bc5ba1a

data/README.md

@@ -35,10 +35,6 @@ After upgrading solidus to a new version run the generator again and follow on s
 
 ## Testing
 
-Create the test site
-
-    bundle exec rake test_app
-
 Run the tests
 
-    bundle exec rake spec
+    bundle exec rspec

data/Rakefile

@@ -2,14 +2,14 @@ require 'rubygems'
 require 'rake'
 require 'rake/testtask'
 require 'rspec/core/rake_task'
-require 'spree/testing_support/common_rake'
+require 'spree/testing_support/dummy_app/rake_tasks'
 
 RSpec::Core::RakeTask.new
-
 task default: :spec
 
-desc "Generates a dummy app for testing"
-task :test_app do
-  ENV['LIB_NAME'] = 'spree/frontend'
-  Rake::Task['common:test_app'].invoke
-end
+DummyApp::RakeTasks.new(
+  gem_root: File.expand_path('../', __FILE__),
+  lib_name: 'solidus_frontend'
+)
+
+task test_app: 'db:reset'

data/app/assets/config/solidus_frontend_manifest.js

@@ -1,5 +1,3 @@
-//= link_tree ../../../vendor/assets/javascripts/jquery.validate/localization/ .js
-//
 //= link_tree ../images
 //
 //= link spree/frontend/all.js

data/app/assets/javascripts/spree/frontend.js

@@ -1,4 +1,3 @@
-//= require jquery.validate/jquery.validate.min
 //= require spree
 //= require spree/frontend/checkout
 //= require spree/frontend/product

data/app/assets/javascripts/spree/frontend/cart.js

@@ -0,0 +1,30 @@
+Spree.ready(function($) {
+  if ($("form#update-cart").is("*")) {
+    $("form#update-cart a.delete")
+      .show()
+      .one("click", function() {
+        $(this)
+          .parents(".line-item")
+          .first()
+          .find("input.line_item_quantity")
+          .val(0);
+        $(this)
+          .parents("form")
+          .first()
+          .submit();
+        return false;
+      });
+  }
+  $("form#update-cart").submit(function() {
+    $("form#update-cart #update-button").attr("disabled", true);
+  });
+});
+
+Spree.fetch_cart = function(cartLinkUrl) {
+  Spree.ajax({
+    url: cartLinkUrl || Spree.pathFor("cart_link"),
+    success: function(data) {
+      $("#link-to-cart").html(data);
+    }
+  });
+};

data/app/assets/javascripts/spree/frontend/checkout.js

@@ -0,0 +1,24 @@
+//= require jquery.payment
+//= require_self
+//= require spree/frontend/checkout/address
+//= require spree/frontend/checkout/payment
+//= require spree/frontend/checkout/coupon-code
+
+Spree.disableSaveOnClick = function() {
+  $("form.edit_order").submit(function() {
+    $(this)
+      .find(":submit, :image")
+      .attr("disabled", true)
+      .removeClass("primary")
+      .addClass("disabled");
+  });
+};
+
+Spree.ready(function($) {
+  var termsCheckbox = $("#accept_terms_and_conditions");
+  termsCheckbox.change(function() {
+    var submitBtn = $(this.closest("form")).find(":submit");
+    submitBtn.prop("disabled", !this.checked);
+    submitBtn.toggleClass("disabled", !this.checked);
+  });
+});

data/app/assets/javascripts/spree/frontend/checkout/address.js

@@ -0,0 +1,128 @@
+Spree.ready(function($) {
+  if ($("#checkout_form_address").is("*")) {
+    // Hidden by default to support browsers with javascript disabled
+    $(".js-address-fields").show();
+
+    var getCountryId = function(region) {
+      return $("#" + region + "country select").val();
+    };
+
+    var statesByCountry = {};
+
+    var updateState = function(region) {
+      var countryId = getCountryId(region);
+      if (countryId != null) {
+        if (statesByCountry[countryId] == null) {
+          $.get(
+            Spree.routes.states_search,
+            {
+              country_id: countryId
+            },
+            function(data) {
+              statesByCountry[countryId] = {
+                states: data.states,
+                states_required: data.states_required
+              };
+              fillStates(region);
+            }
+          );
+        } else {
+          fillStates(region);
+        }
+      }
+    };
+
+    var fillStates = function(region) {
+      var countryId = getCountryId(region);
+      var data = statesByCountry[countryId];
+      if (data == null) {
+        return;
+      }
+      var statesRequired = data.states_required;
+      var states = data.states;
+      var statePara = $("#" + region + "state");
+      var stateSelect = statePara.find("select");
+      var stateInput = statePara.find("input");
+      var stateSpanRequired = statePara.find('[id$="state-required"]');
+      if (states.length > 0) {
+        var selected = parseInt(stateSelect.val());
+        stateSelect.html("");
+        var statesWithBlank = [
+          {
+            name: "",
+            id: ""
+          }
+        ].concat(states);
+        $.each(statesWithBlank, function(idx, state) {
+          var opt;
+          opt = $(document.createElement("option"))
+            .attr("value", state.id)
+            .html(state.name);
+          if (selected === state.id) {
+            opt.prop("selected", true);
+          }
+          stateSelect.append(opt);
+        });
+        stateSelect.prop("disabled", false).show();
+        stateInput.hide().prop("disabled", true);
+        statePara.show();
+        if (statesRequired) {
+          stateSelect.addClass("required");
+          stateSpanRequired.show();
+        } else {
+          stateSelect.removeClass("required");
+          stateSpanRequired.hide();
+        }
+        stateInput.removeClass("required");
+      } else {
+        stateSelect.hide().prop("disabled", true);
+        stateInput.show();
+        if (statesRequired) {
+          stateSpanRequired.show();
+          stateInput.addClass("required");
+        } else {
+          stateInput.val("");
+          stateSpanRequired.hide();
+          stateInput.removeClass("required");
+        }
+        statePara.toggle(!!statesRequired);
+        stateInput.prop("disabled", !statesRequired);
+        stateSelect.removeClass("required");
+      }
+    };
+
+    $("#bcountry select").change(function() {
+      updateState("b");
+    });
+
+    $("#scountry select").change(function() {
+      updateState("s");
+    });
+
+    updateState("b");
+
+    var order_use_billing = $("input#order_use_billing");
+    order_use_billing.change(function() {
+      update_shipping_form_state(order_use_billing);
+    });
+
+    var update_shipping_form_state = function(order_use_billing) {
+      if (order_use_billing.is(":checked")) {
+        $("#shipping .inner").hide();
+        $("#shipping .inner input, #shipping .inner select").prop(
+          "disabled",
+          true
+        );
+      } else {
+        $("#shipping .inner").show();
+        $("#shipping .inner input, #shipping .inner select").prop(
+          "disabled",
+          false
+        );
+        updateState("s");
+      }
+    };
+
+    update_shipping_form_state(order_use_billing);
+  }
+});

data/app/assets/javascripts/spree/frontend/checkout/coupon-code.js

@@ -0,0 +1,40 @@
+Spree.onCouponCodeApply = function(e) {
+  var couponCodeField = $("#order_coupon_code");
+  var couponCode = $.trim(couponCodeField.val());
+  if (couponCode === "") {
+    return;
+  }
+  var couponStatus = $("#coupon_status");
+  var successClass = "success";
+  var errorClass = "alert";
+  couponStatus.removeClass([successClass, errorClass].join(" "));
+  var data = {
+    order_token: Spree.current_order_token,
+    coupon_code: couponCode
+  };
+  var req = Spree.ajax({
+    method: "PUT",
+    url: Spree.routes.apply_coupon_code(Spree.current_order_id),
+    data: JSON.stringify(data),
+    contentType: "application/json"
+  });
+  req.done(function(data) {
+    window.location.reload();
+    couponCodeField.val("");
+    couponStatus
+      .addClass(successClass)
+      .html("Coupon code applied successfully.");
+  });
+  req.fail(function(xhr) {
+    var handler;
+    // handler = JSON.parse(xhr.responseText)
+    handler = xhr.responseJSON;
+    couponStatus.addClass(errorClass).html(handler["error"]);
+  });
+};
+
+Spree.ready(function($) {
+  $("#coupon-code-apply-button").click(function(e) {
+    Spree.onCouponCodeApply(e);
+  });
+});

data/app/assets/javascripts/spree/frontend/checkout/payment.js

@@ -0,0 +1,55 @@
+Spree.ready(function($) {
+  Spree.onPayment = function() {
+    if ($("#checkout_form_payment").is("*")) {
+      if ($("#existing_cards").is("*")) {
+        $("#payment-method-fields").hide();
+        $("#payment-methods").hide();
+
+        $("#use_existing_card_yes").click(function() {
+          $("#payment-method-fields").hide();
+          $("#payment-methods").hide();
+          $(".existing-cc-radio").prop("disabled", false);
+        });
+
+        $("#use_existing_card_no").click(function() {
+          $("#payment-method-fields").show();
+          $("#payment-methods").show();
+          $(".existing-cc-radio").prop("disabled", true);
+        });
+      }
+
+      $(".cardNumber").payment("formatCardNumber");
+      $(".cardExpiry").payment("formatCardExpiry");
+      $(".cardCode").payment("formatCardCVC");
+
+      $(".cardNumber").change(function() {
+        $(this)
+          .parent()
+          .siblings(".ccType")
+          .val($.payment.cardType(this.value));
+      });
+
+      $(
+        'input[type="radio"][name="order[payments_attributes][][payment_method_id]"]'
+      ).click(function() {
+        $("#payment-methods li").hide();
+        if (this.checked) {
+          $("#payment_method_" + this.value).show();
+        }
+      });
+
+      $("#cvv_link").on("click", function(event) {
+        var windowName = "cvv_info";
+        var windowOptions =
+          "left=20,top=20,width=500,height=500,toolbar=0,resizable=0,scrollbars=1";
+        window.open($(this).attr("href"), windowName, windowOptions);
+        event.preventDefault();
+      });
+
+      // Activate already checked payment method if form is re-rendered
+      // i.e. if user enters invalid data
+      $('input[type="radio"]:checked').click();
+    }
+  };
+  Spree.onPayment();
+});

data/app/assets/javascripts/spree/frontend/product.js

@@ -0,0 +1,81 @@
+Spree.ready(function($) {
+  Spree.addImageHandlers = function() {
+    var thumbnails = $("#product-images ul.thumbnails");
+    $("#main-image").data("selectedThumb", $("#main-image img").attr("src"));
+    if (!thumbnails.find("li.selected").length) {
+      thumbnails
+        .find("li")
+        .eq(0)
+        .addClass("selected");
+    }
+    thumbnails.find("a").on("click", function(event) {
+      $("#main-image").data(
+        "selectedThumb",
+        $(event.currentTarget).attr("href")
+      );
+      $("#main-image").data(
+        "selectedThumbId",
+        $(event.currentTarget)
+          .parent()
+          .attr("id")
+      );
+      thumbnails.find("li").removeClass("selected");
+      $(event.currentTarget)
+        .parent("li")
+        .addClass("selected");
+      return false;
+    });
+    thumbnails.find("li").on("mouseenter", function(event) {
+      $("#main-image img").attr(
+        "src",
+        $(event.currentTarget)
+          .find("a")
+          .attr("href")
+      );
+    });
+    thumbnails.find("li").on("mouseleave", function(event) {
+      $("#main-image img").attr("src", $("#main-image").data("selectedThumb"));
+    });
+  };
+
+  Spree.showVariantImages = function(variantId) {
+    $("li.vtmb").hide();
+    $("li.tmb-" + variantId).show();
+    var currentThumb = $("#" + $("#main-image").data("selectedThumbId"));
+    if (!currentThumb.hasClass("vtmb-" + variantId)) {
+      var thumb = $($("#product-images ul.thumbnails li:visible.vtmb").eq(0));
+      if (!(thumb.length > 0)) {
+        thumb = $($("#product-images ul.thumbnails li:visible").eq(0));
+      }
+      var newImg = thumb.find("a").attr("href");
+      $("#product-images ul.thumbnails li").removeClass("selected");
+      thumb.addClass("selected");
+      $("#main-image img").attr("src", newImg);
+      $("#main-image").data("selectedThumb", newImg);
+      $("#main-image").data("selectedThumbId", thumb.attr("id"));
+    }
+  };
+
+  Spree.updateVariantPrice = function(variant) {
+    var variantPrice = variant.data("price");
+    if (variantPrice) {
+      $(".price.selling").text(variantPrice);
+    }
+  };
+
+  var radios = $('#product-variants input[type="radio"]');
+  if (radios.length > 0) {
+    var selectedRadio = $(
+      '#product-variants input[type="radio"][checked="checked"]'
+    );
+    Spree.showVariantImages(selectedRadio.attr("value"));
+    Spree.updateVariantPrice(selectedRadio);
+  }
+
+  Spree.addImageHandlers();
+
+  radios.click(function(event) {
+    Spree.showVariantImages(this.value);
+    Spree.updateVariantPrice($(this));
+  });
+});

data/app/assets/stylesheets/spree/frontend/_variables.scss

@@ -15,6 +15,9 @@ $product_body_text_color:   #404042 !default;
 $product_price_text_color:  #252525 !default;
 $product_link_text_color:   #BBBBBB !default;
 
+$cart_total_background_color: $link_text_color !default;
+$cart_total_text_color: #FFFFFF !default;
+
 /*--------------------------------------*/
 /* Fonts import from remote
 /*--------------------------------------*/

data/app/assets/stylesheets/spree/frontend/screen.css.scss

@@ -993,10 +993,10 @@ div[data-hook="inside_cart_form"] {
 }
 
 .cart-subtotal, .cart-total {
-  background: #00ADEE;
+  background: $cart_total_background_color;
 
   td h5 {
-    color: #fff;
+    color: $cart_total_text_color;
   }
 }