Delete Delete';
+ var html = '';
+ //var html = ' Delete';
element.append(html);
}
}
diff --git a/app/assets/stylesheets/store/openfoodweb.css.scss b/app/assets/stylesheets/store/openfoodweb.css.scss
index 3e91985fe9..bf08508f82 100644
--- a/app/assets/stylesheets/store/openfoodweb.css.scss
+++ b/app/assets/stylesheets/store/openfoodweb.css.scss
@@ -1,4 +1,4 @@
-@import "screen";
+@import 'screen';
a:hover {
color: lighten($link_text_color, 20) !important;
diff --git a/app/assets/stylesheets/store/variables.css.scss b/app/assets/stylesheets/store/variables.css.scss
index 33e0fac143..4eab8c3ce2 100644
--- a/app/assets/stylesheets/store/variables.css.scss
+++ b/app/assets/stylesheets/store/variables.css.scss
@@ -1,18 +1,18 @@
/*--------------------------------------*/
/* Colors
/*--------------------------------------*/
-$c_green: #8dba53; /* Spree green */
-$c_red: #e45353; /* Error red */
+$c_green: #8dba53 !default; /* Spree green */
+$c_red: #e45353 !default; /* Error red */
-$layout_background_color: #FFFFFF;
-$title_text_color: #404042;
-$body_text_color: #404042;
-$link_text_color: #006066;
+$layout_background_color: #FFFFFF !default;
+$title_text_color: #404042 !default;
+$body_text_color: #404042 !default;
+$link_text_color: #006066 !default;
-$product_background_color: #FFFFFF;
-$product_title_text_color: #404042;
-$product_body_text_color: #404042;
-$product_link_text_color: #BBBBBB;
+$product_background_color: #FFFFFF !default;
+$product_title_text_color: #404042 !default;
+$product_body_text_color: #404042 !default;
+$product_link_text_color: #BBBBBB !default;
/*--------------------------------------*/
/* Fonts import from remote
@@ -22,37 +22,39 @@ $product_link_text_color: #BBBBBB;
/*--------------------------------------*/
/* Font families
/*--------------------------------------*/
-$ff_base: 'Ubuntu', sans-serif;
+$ff_base: 'Ubuntu', sans-serif !default;
/*--------------------------------------
| Font sizes
|--------------------------------------
|- Navigation
| */
- $header_navigation_font_size: 14px;
- $horizontal_navigation_font_size: 16px;
- $main_navigation_header_font_size: 14px;
- $main_navigation_font_size: 12px;
+ $header_navigation_font_size: 14px !default;
+ $horizontal_navigation_font_size: 16px !default;
+ $main_navigation_header_font_size: 14px !default;
+ $main_navigation_font_size: 12px !default;
/*|------------------------------------
|- Product Listing
| */
- $product_list_name_font_size: 12px;
- $product_list_price_font_size: 16px;
- $product_list_header_font_size: 20px;
- $product_list_search_font_size: 14px;
+ $product_list_name_font_size: 12px !default;
+ $product_list_price_font_size: 16px !default;
+ $product_list_header_font_size: 20px !default;
+ $product_list_search_font_size: 14px !default;
/*|------------------------------------
|- Product Details
| */
- $product_detail_name_font_size: 24px;
- $product_detail_description_font_size: 12px;
- $product_detail_price_font_size: 20px;
- $product_detail_title_font_size: 14px;
+ $product_detail_name_font_size: 24px !default;
+ $product_detail_description_font_size: 12px !default;
+ $product_detail_price_font_size: 20px !default;
+ $product_detail_title_font_size: 14px !default;
/*|------------------------------------
|- Basic
| */
- $heading_font_size: 24px;
- $sub_heading_font_size: 14px;
- $button_font_size: 12px;
- $input_box_font_size: 13px;
- $base_font_size: 12px;
- $button_border_color: rgba(0, 138, 189, .75);
+ $heading_font_size: 24px !default;
+ $sub_heading_font_size: 14px !default;
+ $button_font_size: 12px !default;
+ $input_box_font_size: 13px !default;
+ $base_font_size: 12px !default;
+ $border_color: lighten($body_text_color, 60);
+ $default_border: 1px solid $border_color;
+ $button_border_color: rgba(0, 138, 189, .75) !default;
diff --git a/app/controllers/base_controller.rb b/app/controllers/base_controller.rb
index 8c951f993a..5617a35918 100644
--- a/app/controllers/base_controller.rb
+++ b/app/controllers/base_controller.rb
@@ -1,6 +1,6 @@
class BaseController < ApplicationController
include Spree::Core::ControllerHelpers
- include Spree::Core::RespondWith
+ include Spree::Core::ControllerHelpers::RespondWith
helper 'spree/base'
diff --git a/app/controllers/enterprises_controller.rb b/app/controllers/enterprises_controller.rb
index 1290530ddd..a582d0e6c0 100644
--- a/app/controllers/enterprises_controller.rb
+++ b/app/controllers/enterprises_controller.rb
@@ -1,4 +1,7 @@
+include Spree::ProductsHelper
class EnterprisesController < BaseController
+ helper Spree::AnalyticsHelper
+
def index
@enterprises = Enterprise.all
end
diff --git a/app/controllers/spree/base_controller_decorator.rb b/app/controllers/spree/base_controller_decorator.rb
deleted file mode 100644
index f745df6582..0000000000
--- a/app/controllers/spree/base_controller_decorator.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-module Spree
- BaseController.class_eval do
-
- # Override definition in spree/auth/app/controllers/spree/base_controller_decorator.rb
- # Do not attempt to merge incomplete and current orders when they have differing distributors
- # Instead, destroy the incomplete orders, otherwise they are restored after checkout, causing much confusion
- def set_current_order
- if current_user
- if current_user.respond_to?(:last_incomplete_order)
- last_incomplete_order = current_user.last_incomplete_order
- if session[:order_id].nil? && last_incomplete_order
- session[:order_id] = last_incomplete_order.id
- elsif current_order && last_incomplete_order && current_order != last_incomplete_order
- if current_order.distributor.nil? || current_order.distributor == last_incomplete_order.distributor
- current_order.set_distributor! last_incomplete_order.distributor if current_order.distributor.nil?
- current_order.merge!(last_incomplete_order)
- else
- last_incomplete_order.destroy
- end
- end
- end
- end
- end
- end
-end
diff --git a/app/controllers/spree/checkout_controller_decorator.rb b/app/controllers/spree/checkout_controller_decorator.rb
new file mode 100644
index 0000000000..b288b2da24
--- /dev/null
+++ b/app/controllers/spree/checkout_controller_decorator.rb
@@ -0,0 +1,5 @@
+Spree::CheckoutController.class_eval do
+ def before_payment
+ current_order.payments.destroy_all if request.put?
+ end
+end
\ No newline at end of file
diff --git a/app/controllers/spree/orders_controller_decorator.rb b/app/controllers/spree/orders_controller_decorator.rb
index ca7978e64a..730d96b279 100644
--- a/app/controllers/spree/orders_controller_decorator.rb
+++ b/app/controllers/spree/orders_controller_decorator.rb
@@ -19,7 +19,7 @@ Spree::OrdersController.class_eval do
def populate_order_count_on_hand
params[:products].each do |product_id, variant_id|
product = Spree::Product.find product_id
- if product.count_on_hand < params[:quantity].to_i
+ if product.count_on_hand < params[:quantity].to_i && product.has_variants? == false
flash[:error] = "Unfortunately " + (product.count_on_hand == 0 ? "no" : "only" + product.count_on_hand.to_s ) + " units of the selected item remain."
redirect_populate_to_first_product
end
@@ -37,14 +37,14 @@ Spree::OrdersController.class_eval do
def populate_variant_attributes
if params.key? :variant_attributes
params[:variant_attributes].each do |variant_id, attributes|
- @order.set_variant_attributes(Spree::Variant.find(variant_id), attributes)
+ current_order.set_variant_attributes(Spree::Variant.find(variant_id), attributes)
end
end
if params.key? :quantity
params[:products].each do |product_id, variant_id|
max_quantity = params[:max_quantity].to_i
- @order.set_variant_attributes(Spree::Variant.find(variant_id), {:max_quantity => max_quantity})
+ current_order.set_variant_attributes(Spree::Variant.find(variant_id), {:max_quantity => max_quantity})
end
end
end
diff --git a/app/models/spree/order_decorator.rb b/app/models/spree/order_decorator.rb
index 17dbe09405..85c75771b3 100644
--- a/app/models/spree/order_decorator.rb
+++ b/app/models/spree/order_decorator.rb
@@ -21,7 +21,7 @@ Spree::Order.class_eval do
end
def set_variant_attributes(variant, attributes)
- line_item = contains?(variant)
+ line_item = find_line_item_by_variant(variant)
if attributes.key?(:max_quantity) && attributes[:max_quantity].to_i < line_item.quantity
attributes[:max_quantity] = line_item.quantity
diff --git a/app/overrides/add_change_distributor_form_to_checkout_address.rb b/app/overrides/add_change_distributor_form_to_checkout_address.rb
new file mode 100644
index 0000000000..8dd5a7f090
--- /dev/null
+++ b/app/overrides/add_change_distributor_form_to_checkout_address.rb
@@ -0,0 +1,5 @@
+Deface::Override.new(:virtual_path => "spree/checkout/edit",
+ :insert_after => "[data-hook='checkout_summary_box']",
+ :partial => "spree/checkout/other_available_distributors",
+ :name => "add_change_distributor_form_to_checkout_address",
+ :original => '60b9b1a39079f4efa85ff0425108edf671349d4f')
\ No newline at end of file
diff --git a/app/overrides/add_cms_admin_tab.rb b/app/overrides/add_cms_admin_tab.rb
index f2bb052bbb..f13d100502 100644
--- a/app/overrides/add_cms_admin_tab.rb
+++ b/app/overrides/add_cms_admin_tab.rb
@@ -1,4 +1,5 @@
-Deface::Override.new(:virtual_path => "spree/layouts/admin",
- :name => "cms_admin_tab",
- :insert_bottom => "[data-hook='admin_tabs'], #admin_tabs[data-hook]",
- :text => "