solidus_subscription_boxes 0.0.11 → 0.0.12

data/app/controllers/solidus_subscription_boxes/application_controller.rb

@@ -1,4 +1,4 @@
-module SolidusSubscriptionBoxes
-  class ApplicationController < ActionController::Base
-  end
-end
+module SolidusSubscriptionBoxes
+  class ApplicationController < ActionController::Base
+  end
+end

data/app/controllers/solidus_subscription_boxes/subscription_boxes_controller.rb

@@ -1,6 +1,7 @@
-class SolidusSubscriptionBoxes::SubscriptionBoxesController < Spree::StoreController
-  def get_started
-  	@variant = Spree::Product.find_by_slug(params[:product_id]).master
-    @box_variants = SolidusSubscriptionBoxes::SubscriptionPeriod.where(boxable_variant_id: @variant.id).current.variants
-  end
-end
+class SolidusSubscriptionBoxes::SubscriptionBoxesController < Spree::StoreController
+  def get_started
+  	@variant = Spree::Product.find_by_slug(params[:product_id]).master
+    @box_variants = SolidusSubscriptionBoxes::SubscriptionPeriod.where(boxable_variant_id: @variant.id).current.variants
+    @order = current_order
+  end
+end

data/app/decorators/solidus_subscriptions/models/checkout/update_preference_decorator.rb

@@ -1,14 +1,14 @@
-module SolidusSubscriptions
-  module Models
-    module Checkout
-      module UpdatePreferenceDecorator
-        def order
-          order = super
-          order.box_preference = subscription.box_preference unless order.box_preference.present?
-        end
-      end
-    end
-  end
-end
-
+module SolidusSubscriptions
+  module Models
+    module Checkout
+      module UpdatePreferenceDecorator
+        def order
+          order = super
+          order.box_preference = subscription.box_preference unless order.box_preference.present?
+        end
+      end
+    end
+  end
+end
+
 SolidusSubscriptions::Checkout.prepend(SolidusSubscriptions::Models::Checkout::UpdatePreferenceDecorator)

data/app/decorators/spree/controllers/api/v1/subscriptions/meal_preference_decorator.rb

@@ -1,21 +1,21 @@
-module Spree
-  module Controllers
-    module Api
-      module V1
-        module Subscriptions
-          module MealPreferenceDecorator
-            def subscription_params
-              params.require(:subscription).permit(
-                line_items_attributes: line_item_attributes,
-                shipping_address_attributes: Spree::PermittedAttributes.address_attributes,
-                box_preference_attributes: {}
-              )
-            end
-          end
-        end
-      end
-    end
-  end
-end
-
+module Spree
+  module Controllers
+    module Api
+      module V1
+        module Subscriptions
+          module MealPreferenceDecorator
+            def subscription_params
+              params.require(:subscription).permit(
+                line_items_attributes: line_item_attributes,
+                shipping_address_attributes: Spree::PermittedAttributes.address_attributes,
+                box_preference_attributes: {}
+              )
+            end
+          end
+        end
+      end
+    end
+  end
+end
+
 SolidusSubscriptions::Api::V1::SubscriptionsController.prepend(Spree::Controllers::Api::V1::Subscriptions::MealPreferenceDecorator)

data/app/decorators/spree/controllers/orders/meal_preference_decorator.rb

@@ -1,35 +1,35 @@
-module Spree
-  module Controllers
-    module Orders
-      module MealPreferenceDecorator
-        def self.prepended(base)
-          base.after_action(
-            :set_box_preference,
-            only: :populate
-          )
-        end
-
-        private
-        def set_box_preference
-          line_item_ids = @order.line_items.map(&:id)
-          line_item_ids.each { |line_item_id|
-            @order.contents.remove_line_item(LineItem.find(line_item_id))
-          }
-          @order.reload
-          if params[:box_preference_attributes]
-            params[:box_preference_attributes].permit!
-            @order.update_attributes(box_preference_attributes: params[:box_preference_attributes].to_hash)
-            @order.box_preference.preference.each do |key, value|
-              if value.to_i > 0 then
-                variant = Spree::Variant.find(key.to_i)
-                @order.contents.add(variant, value.to_i)
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end
-
-Spree::OrdersController.prepend(Spree::Controllers::Orders::MealPreferenceDecorator)
+module Spree
+  module Controllers
+    module Orders
+      module MealPreferenceDecorator
+        def self.prepended(base)
+          base.after_action(
+            :set_box_preference,
+            only: [:populate, :update]
+          )
+        end
+
+        private
+        def set_box_preference
+          line_item_ids = @order.line_items.map(&:id)
+          line_item_ids.each { |line_item_id|
+            @order.contents.remove_line_item(LineItem.find(line_item_id))
+          }
+          @order.reload
+          if params[:box_preference_attributes]
+            params[:box_preference_attributes].permit!
+            @order.update_attributes(box_preference_attributes: params[:box_preference_attributes].to_hash)
+            @order.box_preference.preference.each do |key, value|
+              if value.to_i > 0 then
+                variant = Spree::Variant.find(key.to_i)
+                @order.contents.add(variant, value.to_i)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
+
+Spree::OrdersController.prepend(Spree::Controllers::Orders::MealPreferenceDecorator)

data/app/decorators/spree/controllers/users/set_box_preference_decorator.rb

@@ -1,31 +1,31 @@
-module Spree
-  module Controllers
-    module Users
-      module SetBoxPreferenceDecorator
-        def self.prepended(base)
-          base.before_action(
-            :set_box_preferences,
-            only: :show
-          )
-        end
-
-        private
-        def set_box_preferences
-          @user.generate_spree_api_key! unless @user.spree_api_key
-
-          must_change_subscriptions = @user.subscriptions.find_all do |subscription|
-            subscription.box_preference.nil?              
-          end
-
-          must_change_subscriptions.each do |subscription|
-            potential_variants = SolidusSubscriptionBoxes::SubscriptionPeriod.period_for_date(subscription.actionable_date).variants
-            selected_preferences = Hash[potential_variants.sample(3).collect { |variant| [variant.id.to_s, 1.to_s] } ]
-            subscription.box_preference = SolidusSubscriptionBoxes::BoxPreference.new(preference: selected_preferences)
-          end
-        end
-      end
-    end
-  end
-end
-  
-Spree::UsersController.prepend(Spree::Controllers::Users::SetBoxPreferenceDecorator)
+module Spree
+  module Controllers
+    module Users
+      module SetBoxPreferenceDecorator
+        def self.prepended(base)
+          base.before_action(
+            :set_box_preferences,
+            only: :show
+          )
+        end
+
+        private
+        def set_box_preferences
+          @user.generate_spree_api_key! unless @user.spree_api_key
+
+          must_change_subscriptions = @user.subscriptions.find_all do |subscription|
+            subscription.box_preference.nil?              
+          end
+
+          must_change_subscriptions.each do |subscription|
+            potential_variants = SolidusSubscriptionBoxes::SubscriptionPeriod.period_for_date(subscription.actionable_date).variants
+            selected_preferences = Hash[potential_variants.sample(3).collect { |variant| [variant.id.to_s, 1.to_s] } ]
+            subscription.box_preference = SolidusSubscriptionBoxes::BoxPreference.new(preference: selected_preferences)
+          end
+        end
+      end
+    end
+  end
+end
+  
+Spree::UsersController.prepend(Spree::Controllers::Users::SetBoxPreferenceDecorator)

data/app/decorators/spree/orders/preference_decorator.rb

@@ -1,14 +1,14 @@
-module Spree
-  module Orders
-    module PreferenceDecorator
-      def self.prepended(base)
-        base.has_one :box_preference, as: :preferable, class_name: 'SolidusSubscriptionBoxes::BoxPreference'
-        base.accepts_nested_attributes_for :box_preference
-      end
-    end
-  end
-end
-
-Spree::Order.prepend(Spree::Orders::PreferenceDecorator)
-SolidusSubscriptions::Subscription.prepend(Spree::Orders::PreferenceDecorator)
-SolidusSubscriptions::Installment.prepend(Spree::Orders::PreferenceDecorator)
+module Spree
+  module Orders
+    module PreferenceDecorator
+      def self.prepended(base)
+        base.has_one :box_preference, as: :preferable, class_name: 'SolidusSubscriptionBoxes::BoxPreference'
+        base.accepts_nested_attributes_for :box_preference
+      end
+    end
+  end
+end
+
+Spree::Order.prepend(Spree::Orders::PreferenceDecorator)
+SolidusSubscriptions::Subscription.prepend(Spree::Orders::PreferenceDecorator)
+SolidusSubscriptions::Installment.prepend(Spree::Orders::PreferenceDecorator)

data/app/decorators/spree/products/boxable_decorator.rb

@@ -1,15 +1,15 @@
-module Spree
-  module Products
-    module BoxableDecorator
-      def self.prepended(klass)
-        klass.delegate :"boxable", :"boxable=", to: :find_or_build_master
-        klass.delegate :"boxed_subscription_periods_variants", to: :find_or_build_master
-        klass.delegate :"boxed_subscription_periods", to: :find_or_build_master
-        klass.delegate :"subscription_periods", to: :find_or_build_master
-        klass.accepts_nested_attributes_for :master
-      end
-    end
-  end
-end
-
-Spree::Product.prepend Spree::Products::BoxableDecorator
+module Spree
+  module Products
+    module BoxableDecorator
+      def self.prepended(klass)
+        klass.delegate :"boxable", :"boxable=", to: :find_or_build_master
+        klass.delegate :"boxed_subscription_periods_variants", to: :find_or_build_master
+        klass.delegate :"boxed_subscription_periods", to: :find_or_build_master
+        klass.delegate :"subscription_periods", to: :find_or_build_master
+        klass.accepts_nested_attributes_for :master
+      end
+    end
+  end
+end
+
+Spree::Product.prepend Spree::Products::BoxableDecorator

data/app/decorators/spree/variants/subscription_period_decorator.rb

@@ -1,14 +1,14 @@
-module Spree
-    module Variants
-      module SubscriptionPeriodsDecorator
-        def self.prepended(klass)
-          klass.has_many :boxed_subscription_periods_variants, foreign_key: :spree_variant_id, class_name: 'SolidusSubscriptionBoxes::SubscriptionPeriodsVariant'
-          klass.has_many :boxed_subscription_periods, through: :boxed_subscription_periods_variants, class_name: 'SolidusSubscriptionBoxes::SubscriptionPeriod', source: :subscription_period
-          klass.has_many :subscription_periods, foreign_key: :boxable_variant_id, class_name: 'SolidusSubscriptionBoxes::SubscriptionPeriod'
-          klass.accepts_nested_attributes_for :subscription_periods
-        end
-      end
-    end
-  end
-  
+module Spree
+    module Variants
+      module SubscriptionPeriodsDecorator
+        def self.prepended(klass)
+          klass.has_many :boxed_subscription_periods_variants, foreign_key: :spree_variant_id, class_name: 'SolidusSubscriptionBoxes::SubscriptionPeriodsVariant'
+          klass.has_many :boxed_subscription_periods, through: :boxed_subscription_periods_variants, class_name: 'SolidusSubscriptionBoxes::SubscriptionPeriod', source: :subscription_period
+          klass.has_many :subscription_periods, foreign_key: :boxable_variant_id, class_name: 'SolidusSubscriptionBoxes::SubscriptionPeriod'
+          klass.accepts_nested_attributes_for :subscription_periods
+        end
+      end
+    end
+  end
+  
   Spree::Variant.prepend Spree::Variants::SubscriptionPeriodsDecorator

data/app/helpers/solidus_subscription_boxes/application_helper.rb

@@ -1,19 +1,26 @@
-module SolidusSubscriptionBoxes
-  module ApplicationHelper
-    def is_checked(preferable, variant)
-      if preferable.present? && preferable.box_preference.preference.map(&:to_i).include?(variant.id)
-        "checked"
-      else
-        ""
-      end
-    end
-
-    def preferable_value(box_preference, variant_id)
-      if box_preference.present?
-        box_preference.preference.fetch(variant_id.to_s){ 0 }
-      else
-        0
-      end
-    end
-  end
-end
+module SolidusSubscriptionBoxes
+  module ApplicationHelper
+    def is_checked(preferable, variant)
+      if preferable.present? && preferable.box_preference.preference.map(&:to_i).include?(variant.id)
+        "checked"
+      else
+        ""
+      end
+    end
+
+    def preferable_value(box_preference, variant_id, order = nil)
+      if box_preference.present?
+        box_preference.preference.fetch(variant_id.to_s){ 0 }
+      elsif order.present?
+        line_item = order.line_items.detect{|li| li.variant_id == variant_id}
+        if line_item.present?
+          line_item.quantity
+        else
+          0
+        end
+      else
+        0
+      end
+    end
+  end
+end

data/app/jobs/solidus_subscription_boxes/application_job.rb

@@ -1,4 +1,4 @@
-module SolidusSubscriptionBoxes
-  class ApplicationJob < ActiveJob::Base
-  end
-end
+module SolidusSubscriptionBoxes
+  class ApplicationJob < ActiveJob::Base
+  end
+end

data/app/mailers/solidus_subscription_boxes/application_mailer.rb

@@ -1,6 +1,6 @@
-module SolidusSubscriptionBoxes
-  class ApplicationMailer < ActionMailer::Base
-    default from: 'from@example.com'
-    layout 'mailer'
-  end
-end
+module SolidusSubscriptionBoxes
+  class ApplicationMailer < ActionMailer::Base
+    default from: 'from@example.com'
+    layout 'mailer'
+  end
+end

data/app/models/solidus_subscription_boxes/application_record.rb

@@ -1,5 +1,5 @@
-module SolidusSubscriptionBoxes
-  class ApplicationRecord < ActiveRecord::Base
-    self.abstract_class = true
-  end
-end
+module SolidusSubscriptionBoxes
+  class ApplicationRecord < ActiveRecord::Base
+    self.abstract_class = true
+  end
+end

data/app/models/solidus_subscription_boxes/box_preference.rb

@@ -1,10 +1,10 @@
-module SolidusSubscriptionBoxes
-  class BoxPreference < ApplicationRecord
-    belongs_to :preferable, polymorphic: true
-    serialize :preference, Hash
-
-    def variants
-      Spree::Variant.where(id: preference.map(&:to_i))
-    end
-  end
-end
+module SolidusSubscriptionBoxes
+  class BoxPreference < ApplicationRecord
+    belongs_to :preferable, polymorphic: true
+    serialize :preference, Hash
+
+    def variants
+      Spree::Variant.where(id: preference.map(&:to_i))
+    end
+  end
+end

data/app/models/solidus_subscription_boxes/subscription_period.rb

@@ -1,15 +1,15 @@
-module SolidusSubscriptionBoxes
-  class SubscriptionPeriod < ApplicationRecord
-    has_many :subscription_periods_variants, foreign_key: :solidus_subscription_boxes_subscription_period_id, class_name: 'SolidusSubscriptionBoxes::SubscriptionPeriodsVariant'
-    has_many :variants, through: :subscription_periods_variants, class_name: 'Spree::Variant'
-    belongs_to :boxable_variant, class_name: 'Spree::Variant', foreign_key: 'boxable_variant_id'
-
-    def self.current
-      period_for_date(Date.today)
-    end
-
-    def self.period_for_date(date)
-      SubscriptionPeriod.where('start_date <= ?', date).order('start_date desc').first
-    end
-  end
-end
+module SolidusSubscriptionBoxes
+  class SubscriptionPeriod < ApplicationRecord
+    has_many :subscription_periods_variants, foreign_key: :solidus_subscription_boxes_subscription_period_id, class_name: 'SolidusSubscriptionBoxes::SubscriptionPeriodsVariant'
+    has_many :variants, through: :subscription_periods_variants, class_name: 'Spree::Variant'
+    belongs_to :boxable_variant, class_name: 'Spree::Variant', foreign_key: 'boxable_variant_id'
+
+    def self.current
+      period_for_date(Date.today)
+    end
+
+    def self.period_for_date(date)
+      SubscriptionPeriod.where('start_date <= ?', date).order('start_date desc').limit(1).first
+    end
+  end
+end