solidus_backend 2.1.1 → 2.2.0.beta1

data/app/assets/stylesheets/spree/backend/shared/_typography.scss

@@ -1,64 +1,31 @@
 // Base
 //--------------------------------------------------------------
+
+html {
+  font-size: $font-size-root;
+}
+
 body {
   padding: 0;
-  font-family: $base-font-family;
-  font-size: $body-font-size;
   font-weight: 400;
-  color: $color-body-text;
-  background: $color-body-bg;
   text-rendering: optimizeLegibility;
 }
 
 hr {
   border-top: 1px solid $color-border;
-  border-bottom: 1px solid $color-body-bg;
+  border-bottom: 1px solid $body-bg;
   border-left: none;
 }
 
-strong, b {
-  font-weight: $font-weight-bold;
-}
-
-// links
-//--------------------------------------------------------------
-a {
-  color: $color-link;
-  text-decoration: none;
-  line-height: inherit;
-
-  &:active, &:hover {
-    text-decoration: none;
-  }
-  &:visited {
-    color: $color-link-visited;
-  }
-  &:focus {
-    color: $color-link-focus;
-  }
-  &:active {
-    color: $color-link-active;
-  }
-  &:hover {
-    color: $color-link-hover;
-  }
-}
-
 // Headings
 //--------------------------------------------------------------
 
-h1,h2,h3,h4,h5,h6 {
-  font-weight: $font-weight-bold;
-  color: $color-headers;
-  line-height: 1.1;
-}
-
-h1 { font-size: $h1-size; line-height: $h1-size + 6 }
-h2 { font-size: $h2-size; line-height: $h1-size + 4 }
-h3 { font-size: $h3-size; line-height: $h1-size + 2 }
-h4 { font-size: $h4-size; line-height: $h1-size }
-h5 { font-size: $h5-size; line-height: $h1-size }
-h6 { font-size: $h6-size; line-height: $h1-size }
+h1 { line-height: $font-size-h1 + 6 }
+h2 { line-height: $font-size-h1 + 4 }
+h3 { line-height: $font-size-h1 + 2 }
+h4 { line-height: $font-size-h1 }
+h5 { line-height: $font-size-h1 }
+h6 { line-height: $font-size-h1 }
 
 
 // Lists
@@ -89,7 +56,7 @@ dl {
   width: 100%;
   overflow: hidden;
   margin: 5px 0;
-  color: lighten($color-body-text, 15);
+  color: lighten($body-color, 15);
 
   dt, dd {
     float: left;
@@ -136,5 +103,5 @@ dl {
   text-align: center;
   font-size: 120%;
   padding: 40px 0px;
-  color: lighten($color-body-text, 15);
+  color: lighten($body-color, 15);
 }

data/app/assets/stylesheets/spree/backend/spree_admin.scss

@@ -1,6 +1,7 @@
 @import 'bourbon';
 
 @import 'spree/backend/globals/functions';
+@import 'spree/backend/globals/deprecation';
 @import 'spree/backend/globals/variables_override';
 @import 'spree/backend/globals/variables';
 
@@ -11,6 +12,7 @@
 
 @import 'spree/backend/shared/skeleton';
 @import 'spree/backend/shared/typography';
+@import 'spree/backend/shared/images';
 @import 'spree/backend/shared/tables';
 @import 'spree/backend/shared/icons';
 @import 'spree/backend/shared/forms';
@@ -21,8 +23,10 @@
 @import 'spree/backend/components/states';
 @import 'spree/backend/components/actions';
 @import 'spree/backend/components/breadcrumb';
+@import 'spree/backend/components/number_with_currency';
 @import 'spree/backend/components/date-picker';
 @import 'spree/backend/components/hint';
+@import 'spree/backend/components/image_placeholder';
 @import 'spree/backend/components/list_group';
 @import 'spree/backend/components/messages';
 @import 'spree/backend/components/progress';

data/app/controllers/spree/admin/adjustments_controller.rb

@@ -36,7 +36,7 @@ module Spree
 
       def reasons_for(_adjustment)
         [
-          AdjustmentReason.active.to_a,
+          Spree::AdjustmentReason.active.to_a,
           @adjustment.adjustment_reason
         ].flatten.compact.uniq.sort_by { |r| r.name.downcase }
       end

data/app/controllers/spree/admin/base_controller.rb

@@ -46,7 +46,7 @@ module Spree
       end
 
       def lock_order
-        OrderMutex.with_lock!(@order) { yield }
+        Spree::OrderMutex.with_lock!(@order) { yield }
       rescue Spree::OrderMutex::LockFailed
         flash[:error] = Spree.t(:order_mutex_admin_error)
         redirect_to order_mutex_redirect_path

data/app/controllers/spree/admin/cancellations_controller.rb

@@ -32,7 +32,7 @@ module Spree
       end
 
       def load_order
-        @order = Order.find_by_number!(params[:order_id])
+        @order = Spree::Order.find_by_number!(params[:order_id])
         authorize! action, @order
       end
 

data/app/controllers/spree/admin/customer_returns_controller.rb

@@ -1,6 +1,8 @@
 module Spree
   module Admin
     class CustomerReturnsController < ResourceController
+      helper 'spree/admin/reimbursements'
+      helper 'spree/admin/reimbursement_type'
       belongs_to 'spree/order', find_by: :number
 
       before_action :parent # ensure order gets loaded to support our pseudo parent-child relationship

data/app/controllers/spree/admin/general_settings_controller.rb

@@ -1,34 +1,8 @@
 module Spree
   module Admin
     class GeneralSettingsController < Spree::Admin::BaseController
-      include Spree::Backend::Callbacks
-
-      before_action :set_store
-
       def edit
-      end
-
-      def update
-        if @store.update_attributes(store_params)
-          flash[:success] = Spree.t(:successfully_updated, resource: Spree.t(:general_settings))
-          redirect_to edit_admin_general_settings_path
-        else
-          render :edit
-        end
-      end
-
-      private
-
-      def store_params
-        params.require(:store).permit(permitted_params)
-      end
-
-      def permitted_params
-        Spree::PermittedAttributes.store_attributes
-      end
-
-      def set_store
-        @store = current_store
+        redirect_to admin_stores_path
       end
     end
   end

data/app/controllers/spree/admin/images_controller.rb

@@ -17,7 +17,7 @@ module Spree
       end
 
       def load_data
-        @product = Product.friendly.find(params[:product_id])
+        @product = Spree::Product.friendly.find(params[:product_id])
         @variants = @product.variants.collect do |variant|
           [variant.sku_and_options_text, variant.id]
         end

data/app/controllers/spree/admin/option_types_controller.rb

@@ -5,7 +5,7 @@ module Spree
 
       def update_values_positions
         params[:positions].each do |id, index|
-          OptionValue.where(id: id).update_all(position: index)
+          Spree::OptionValue.where(id: id).update_all(position: index)
         end
 
         respond_to do |format|
@@ -21,7 +21,7 @@ module Spree
       end
 
       def load_product
-        @product = Product.find_by_param!(params[:product_id])
+        @product = Spree::Product.find_by_param!(params[:product_id])
       end
 
       def setup_new_option_value
@@ -30,9 +30,9 @@ module Spree
 
       def set_available_option_types
         @available_option_types = if @product.option_type_ids.any?
-          OptionType.where('id NOT IN (?)', @product.option_type_ids)
+          Spree::OptionType.where('id NOT IN (?)', @product.option_type_ids)
         else
-          OptionType.all
+          Spree::OptionType.all
         end
       end
     end

data/app/controllers/spree/admin/orders/customer_details_controller.rb

@@ -11,7 +11,7 @@ module Spree
         end
 
         def edit
-          country_id = Country.default.id
+          country_id = Spree::Country.default.id
           @order.build_bill_address(country_id: country_id) if @order.bill_address.nil?
           @order.build_ship_address(country_id: country_id) if @order.ship_address.nil?
 
@@ -51,7 +51,7 @@ module Spree
         end
 
         def load_order
-          @order = Order.includes(:adjustments).find_by_number!(params[:order_id])
+          @order = Spree::Order.includes(:adjustments).find_by_number!(params[:order_id])
         end
 
         def model_class

data/app/controllers/spree/admin/orders_controller.rb

@@ -48,7 +48,7 @@ module Spree
           params[:q][:completed_at_lt] = params[:q].delete(:created_at_lt)
         end
 
-        @search = Order.accessible_by(current_ability, :index).ransack(params[:q])
+        @search = Spree::Order.accessible_by(current_ability, :index).ransack(params[:q])
 
         # lazy loading other models here (via includes) may result in an invalid query
         # e.g. SELECT  DISTINCT DISTINCT "spree_orders".id, "spree_orders"."created_at" AS alias_0 FROM "spree_orders"
@@ -178,7 +178,7 @@ module Spree
       end
 
       def load_order
-        @order = Order.includes(:adjustments).find_by_number!(params[:id])
+        @order = Spree::Order.includes(:adjustments).find_by_number!(params[:id])
         authorize! action, @order
       end
 

data/app/controllers/spree/admin/payment_methods_controller.rb

@@ -49,7 +49,7 @@ module Spree
       end
 
       def load_providers
-        @providers = PaymentMethod.providers.sort_by(&:name)
+        @providers = Spree::PaymentMethod.providers.sort_by(&:name)
       end
 
       def validate_payment_method_provider

data/app/controllers/spree/admin/payments_controller.rb

@@ -18,7 +18,7 @@ module Spree
       end
 
       def new
-        @payment = @order.payments.build
+        @payment = @order.payments.build(amount: @order.outstanding_balance)
       end
 
       def create
@@ -78,7 +78,7 @@ module Spree
 
       def load_data
         @amount = params[:amount] || load_order.total
-        @payment_methods = PaymentMethod.available_to_admin
+        @payment_methods = Spree::PaymentMethod.active.available_to_admin
         if @payment && @payment.payment_method
           @payment_method = @payment.payment_method
         else
@@ -87,13 +87,13 @@ module Spree
       end
 
       def load_order
-        @order = Order.find_by_number!(params[:order_id])
+        @order = Spree::Order.find_by_number!(params[:order_id])
         authorize! action, @order
         @order
       end
 
       def load_payment
-        @payment = Payment.find(params[:id])
+        @payment = Spree::Payment.find(params[:id])
       end
 
       def load_payment_for_fire

data/app/controllers/spree/admin/products_controller.rb

@@ -46,7 +46,7 @@ module Spree
       end
 
       def destroy
-        @product = Product.friendly.find(params[:id])
+        @product = Spree::Product.friendly.find(params[:id])
         @product.destroy
 
         flash[:success] = Spree.t('notice_messages.product_deleted')
@@ -72,7 +72,7 @@ module Spree
       private
 
       def find_resource
-        Product.with_deleted.friendly.find(params[:id])
+        Spree::Product.with_deleted.friendly.find(params[:id])
       end
 
       def location_after_save
@@ -89,10 +89,10 @@ module Spree
       end
 
       def load_data
-        @taxons = Taxon.order(:name)
-        @option_types = OptionType.order(:name)
-        @tax_categories = TaxCategory.order(:name)
-        @shipping_categories = ShippingCategory.order(:name)
+        @taxons = Spree::Taxon.order(:name)
+        @option_types = Spree::OptionType.order(:name)
+        @tax_categories = Spree::TaxCategory.order(:name)
+        @shipping_categories = Spree::ShippingCategory.order(:name)
       end
 
       def collection

data/app/controllers/spree/admin/promotion_code_batches_controller.rb

@@ -0,0 +1,28 @@
+module Spree
+  module Admin
+    class PromotionCodeBatchesController < ResourceController
+      belongs_to 'spree/promotion'
+
+      create.after :build_promotion_code_batch
+
+      def download
+        require "csv"
+
+        @promotion_code_batch = Spree::PromotionCodeBatch.find(
+          params[:promotion_code_batch_id]
+        )
+
+        send_data(
+          render_to_string,
+          filename: "promotion-code-batch-list-#{@promotion_code_batch.id}.csv"
+        )
+      end
+
+      private
+
+      def build_promotion_code_batch
+        @promotion_code_batch.process
+      end
+    end
+  end
+end

data/app/controllers/spree/admin/promotion_codes_controller.rb

@@ -1,12 +1,16 @@
+require 'csv'
+
 module Spree
   module Admin
-    class PromotionCodesController < Spree::Admin::BaseController
-      require 'csv'
-
+    class PromotionCodesController < Spree::Admin::ResourceController
       def index
         @promotion = Spree::Promotion.accessible_by(current_ability, :read).find(params[:promotion_id])
+        @promotion_codes = @promotion.promotion_codes
 
         respond_to do |format|
+          format.html do
+            @promotion_codes = @promotion_codes.page(params[:page]).per(50)
+          end
           format.csv do
             filename = "promotion-code-list-#{@promotion.id}.csv"
             headers["Content-Type"] = "text/csv"

data/app/controllers/spree/admin/promotions_controller.rb

@@ -2,35 +2,29 @@ module Spree
   module Admin
     class PromotionsController < ResourceController
       before_action :load_data
-      before_action :load_bulk_code_information, only: [:edit]
 
       helper 'spree/promotion_rules'
 
       def create
-        @promotion_builder = Spree::PromotionBuilder.new(
-          permitted_promo_builder_params.merge(user: try_spree_current_user),
-          permitted_resource_params
-        )
-        @promotion = @promotion_builder.promotion
+        @promotion = Spree::Promotion.new(permitted_resource_params)
+        @promotion.codes.new(value: params[:single_code]) if params[:single_code].present?
 
-        if @promotion_builder.perform
+        if params[:promotion_code_batch]
+          @promotion_code_batch = @promotion.promotion_code_batches.new(promotion_code_batch_params)
+        end
+
+        if @promotion.save
+          @promotion_code_batch.process if @promotion_code_batch
           flash[:success] = Spree.t(:promotion_successfully_created)
           redirect_to location_after_save
         else
-          flash[:error] = @promotion_builder.errors.full_messages.join(", ")
+          flash[:error] = @promotion.errors.full_messages.join(", ")
           render action: 'new'
         end
       end
 
       private
 
-      def load_bulk_code_information
-        @promotion_builder = Spree::PromotionBuilder.new(
-          base_code: @promotion.codes.first.try!(:value),
-          number_of_codes: @promotion.codes.count
-        )
-      end
-
       def location_after_save
         spree.edit_admin_promotion_url(@promotion)
       end
@@ -55,16 +49,12 @@ module Spree
         @collection
       end
 
-      def promotion_includes
-        [:promotion_actions]
+      def promotion_code_batch_params
+        params.require(:promotion_code_batch).permit!
       end
 
-      def permitted_promo_builder_params
-        if params[:promotion_builder]
-          params[:promotion_builder].permit(:base_code, :number_of_codes)
-        else
-          {}
-        end
+      def promotion_includes
+        [:promotion_actions]
       end
     end
   end