Close #1037 Add Quantity to Customer and Add Query or Create Variant …

…in Subscription

app/controllers/spree/billing/subscriptions_controller.rb

@@ -4,6 +4,54 @@ class SubscriptionsController < Spree::Billing::BaseController
       before_action :load_customer
       before_action :load_subscription, if: -> { member_action? }
 
+      def load_option_types_form
+        @product = Spree::Product.find(params[:product_id])
+
+        @variant = @product.variants.new
+
+        session[:product_id] = @product.id
+
+        render partial: 'spree/billing/subscriptions/option_types_form'
+      end
+
+      def create_sku
+        @product = Spree::Product.find(session[:product_id])
+
+        return if params[:variant].blank?
+
+        option_values = params[:variant][:option_value_ids].map { |id| Spree::OptionValue.find(id) }
+        sku_parts = [@product.name]
+
+        option_values.each do |option_value|
+          sku_parts << "#{option_value.option_type.name}-#{option_value.name}"
+        end
+
+        sku_parts << "price-#{params[:variant][:price]}"
+
+        params[:variant][:sku] = sku_parts.join('-').gsub(' ', '-').downcase
+      end
+
+      def create
+        @product = Spree::Product.find(session[:product_id])
+        @variant = @product.variants.new
+        create_sku
+        @variant = @product.variants.where(variant_params).first_or_initialize if variant_params.present?
+
+        if @variant.persisted?
+          @subscription = @variant.subscriptions.new(subscription_params.merge(variant_id: @variant.id))
+        else
+          save_variant
+          @subscription = @variant.subscriptions.new(subscription_params)
+          @subscription.variant_id = @variant.id
+        end
+
+        @subscription.save
+        return unless @subscription
+
+        flash[:success] = flash_message_for(@subscription, :successfully_created)
+        redirect_to billing_customer_subscriptions_url(@customer)
+      end
+
       protected
 
       def collection
@@ -13,6 +61,14 @@ def collection
         @collection = @search.result.page(page).per(per_page)
       end
 
+      def save_variant
+        @variant = @product.variants.new(variant_params)
+        @variant.option_value_ids = params[:variant][:option_value_ids]
+        @variant.price = params[:variant][:price]
+        @variant.stock_items.new(stock_location_id: @current_vendor.id, count_on_hand: 1)
+        @variant.save
+      end
+
       def load_customer
         customer
       end
@@ -39,6 +95,14 @@ def object_name
       def collection_url(options = {})
         billing_customer_subscriptions_url(options)
       end
+
+      def variant_params
+        params.require(:variant).permit(:sku)
+      end
+
+      def subscription_params
+        params.require(:spree_cm_commissioner_subscription).permit(:start_date, :customer_id, :status)
+      end
     end
   end
 end

app/models/spree_cm_commissioner/subscription.rb

@@ -6,6 +6,7 @@ class Subscription < SpreeCmCommissioner::Base
 
     belongs_to :variant, class_name: 'Spree::Variant'
     belongs_to :customer, class_name: 'SpreeCmCommissioner::Customer'
+    belongs_to :product, class_name: 'Spree::Product'
 
     has_many :orders, -> { order(:created_at) }, class_name: 'Spree::Order', dependent: :nullify
     has_many :line_items, through: :orders, class_name: 'Spree::LineItem'
@@ -23,6 +24,8 @@ class Subscription < SpreeCmCommissioner::Base
     after_create :create_order
     after_commit :update_customer_active_subscriptions_count
 
+    accepts_nested_attributes_for :variant
+
     def create_order
       SpreeCmCommissioner::SubscribedOrderCreator.call(subscription: self)
     end

app/models/spree_cm_commissioner/variant_decorator.rb

@@ -8,6 +8,8 @@ def self.prepended(base)
       base.validate     :validate_option_types
 
       base.scope :subscribable, -> { active.joins(:product).where(product: { subscribable: true, status: :active }) }
+
+      base.has_many :subscriptions, class_name: 'SpreeCmCommissioner::Subscription', dependent: :destroy
     end
 
     def selected_option_value_ids

app/views/spree/billing/customers/_form.html.erb

@@ -31,5 +31,10 @@
       <%= f.collection_select(:taxon_id, Spree::Taxon.where(depth: 1), :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'select2', required: true })%>
       <%= f.error_message_on :taxon_id %>
     <% end %>
+    <%= f.field_container :quantity do %>
+      <%= f.label :quantity, I18n.t('activerecord.attributes.spree/order.quantity') %>
+      <%= f.number_field :quantity, class: 'form-control', required: true %>
+      <%= f.error_message_on :quantity %>
+    <% end %>
   </div>
 </div>

app/views/spree/billing/shared/_invoice.html.erb

@@ -8,8 +8,10 @@
   @email =  @vendor.notification_email
   @note =  @vendor.note
 
+  @quantity = @customer.quantity
   @product = @invoice.order.line_items.first.variant.sku
   @price = @invoice.order.line_items.first.display_price
+  @total_price = @price.to_s.gsub(/[^\d.]/, '').to_d * @quantity
   @total = @invoice.order.display_total
   @from_date = @invoice.order.line_items.first.to_date.strftime("%B %Y")
   @date = @invoice.date.strftime('%Y-%m-%d')
@@ -92,8 +94,10 @@
             <tr>
               <th scope="col">ល.រ​​​ / N</th>
               <th scope="col">បរិយាយ / Description</th>
+              <th scope="col">ចំនួន / Quantity</th>
               <th scope="col">ប្រចាំខែ / Month</th>
               <th scope="col">ទឹកប្រាក់​ / Amount</th>
+              <th scope="col">ទឹកប្រាក់​សរុប / Total Amount</th>
             </tr>
           </thead>
           <tbody class="list-unstyled">
@@ -104,6 +108,11 @@
                   <li> <%= @product %></li>
                 </ul>
               </td>
+              <td>
+                <ul class="list-unstyled">
+                  <li> <%= @quantity %></li>
+                </ul>
+              </td>
               <td>
                 <ul class="list-unstyled">
                     <li> <%= @from_date %></li>
@@ -116,6 +125,11 @@
                   </li>
                 </ul>
               </td>
+              <td>
+                <ul class="list-unstyled">
+                  <li> <%= @total_price %></li>
+                </ul>
+              </td>
             </tr>
             <%  @order.adjustments.each do |adjustment|  %>
               <tr>
@@ -142,7 +156,7 @@
           <div class="d-flex justify-content-between align-items-center bg-primary pt-3 px-2 font-weight-bold text-white">
                 <p>ទឹកប្រាក់​ត្រូវទូទាត់​​ / Total Amount due</p>
                 <p>
-                  <%= @total %>
+                  <%= @total_price %>
                 </p>
           </div>
 

app/views/spree/billing/subscriptions/_form.html.erb

@@ -1,22 +1,94 @@
 <div data-hook="admin_user_form_fields" class="row">
-  <div class="col-12 col-md-6">
+  <div class="col-12">
     <%= f.hidden_field :customer_id, value: @customer.id %>
-    <%= f.field_container :variant_id do %>
-      <%= f.label :variant, Spree.t(:variant) %>
-      <%= f.collection_select(:variant_id, @customer.subscribable_variants, :id, :display_variant, { include_blank: false }, { class: 'select2' ,disabled: @subscription.persisted?}) %>
-      <%= f.error_message_on :product_id %>
-    <% end %>
-    <%= f.field_container :start_date do %>
-      <%= f.label :start_date, Spree.t(:start_date) %>
-      <%= f.date_field :start_date, class: 'form-control', disabled: @subscription.persisted? %>
-      <%= f.error_message_on :start_date %>
-    <% end %>
-    <% if @subscription.id.present? %>
-      <%= f.field_container :status do %>
-        <%= f.label :status, Spree.t(:status) %>
-        <%= f.select :status, SpreeCmCommissioner::Subscription.statuses.keys, {}, class: 'select2' %>
-        <%= f.error_message_on :status %>
+
+    <div class="col-6">
+      <%= f.field_container :product do %>
+        <%= f.label :product, Spree:t(:product) %>
+        <%= f.select :product, options_for_select(Spree::Product.joins(:taxons)
+                                  .where(spree_taxons: { id: @customer.taxon_id })
+                                  .map{ |product| [product.name, product.id] }),
+                              if @subscription.persisted?
+                                { placeholder: @subscription.variant.product.name }
+                              else
+                                { include_blank: true }
+                              end,
+                              { class: "select2-clear", disabled: @subscription.persisted? } %>
+        <%= f.error_message_on :product %>
       <% end %>
+    </div>
+
+    <% if @subscription.id.present? %>
+      <div class="col-6">
+        <%= f.field_container :variant_id do %>
+          <%= f.label :variant_id, Spree:t(:variant) %>
+          <%= f.select :variant_id, options_for_select(Spree::Variant.joins(:subscriptions).where(cm_subscriptions: { customer_id: @customer.id })
+                                    .map{ |variant| [variant.sku, variant.id] }),
+                                if @subscription.persisted?
+                                  { placeholder: @subscription.variant.sku }
+                                else
+                                  { include_blank: true }
+                                end,
+                                { class: "select2-clear", disabled: @subscription.persisted? } %>
+          <%= f.error_message_on :product %>
+        <% end %>
+      </div>
+    <% else %>
+      <div id="option-types-form-container" class="col-12">
+      </div>
     <% end %>
+
+    <div class="col-6">
+      <%= f.field_container :start_date do %>
+        <%= f.label :start_date, Spree.t(:start_date) %>
+        <%= f.date_field :start_date, class: 'form-control', disabled: @subscription.persisted? %>
+        <%= f.error_message_on :start_date %>
+      <% end %>
+    </div>
+
+    <div class="col-6">
+      <% if @subscription.id.present? %>
+        <%= f.field_container :status do %>
+          <%= f.label :status, Spree.t(:status) %>
+          <%= f.select :status, SpreeCmCommissioner::Subscription.statuses.keys, {}, class: 'select2' %>
+          <%= f.error_message_on :status %>
+        <% end %>
+      <% end %>
+    </div>
   </div>
 </div>
+
+<script>
+  $(document).ready(function () {
+    const productSelector = "#spree_cm_commissioner_subscription_product";
+    const variantIdSelector = "#spree_cm_commissioner_subscription_variant_id";
+    const optionTypesFormDiv = "#option-types-form-container";
+
+    $(productSelector).on("change", function () {
+      removeOptionTypesForm();
+      appendOptionTypesForm();
+    });
+
+    function appendOptionTypesForm() {
+      var productId = $(productSelector).val();
+
+      $.ajax({
+        url: '../subscriptions/load_option_types_form',
+        type: 'GET',
+        data: { product_id: productId },
+        dataType: 'html',
+        success: function (response) {
+          console.log('Success fetching form:', response);
+          $(optionTypesFormDiv).append(response);
+        },
+        error: function (error) {
+          console.error('Error fetching form:', error);
+        }
+      });
+    }
+
+    function removeOptionTypesForm() {
+      $(optionTypesFormDiv).empty();
+    }
+  });
+</script>

app/views/spree/billing/subscriptions/_option_types_form.html.erb

@@ -0,0 +1,31 @@
+<%= fields_for @variant do |f| %>
+  <div class="card mb-3">
+    <div class="card-header">
+      <h5 class="mb-0"><%= Spree.t(:variant) %></h5>
+    </div>
+    <div class="row">
+      <div data-hook="billing_variant_form_fields" class="col-6 p-4">
+        <div data-hook="variants">
+          <div class="form-group " data-hook="price">
+            <%= f.label :price, Spree.t(:price) %>
+            <%= f.text_field :price, value: number_to_currency(@variant.price, unit: ''), class: 'form-control' %>
+          </div>
+        </div>
+      </div>
+      <div data-hook="billing_varaint_option_types_field" class="col-6 p-4">
+        <% @product.option_types.each do |option_type| %>
+          <div class="form-group" data-hook="presentation">
+            <%= label :new_variant, option_type.presentation %>
+            <% if option_type.name == 'color' %>
+              <%= f.collection_select 'option_value_ids', option_type.option_values, :id, :name,
+                  { include_blank: true }, { name: 'variant[option_value_ids][]', class: 'select2-clear form-control', id: "option_value_ids-#{option_type.id}" } %>
+            <% else %>
+              <%= f.collection_select 'option_value_ids', option_type.option_values, :id, :presentation,
+                  { include_blank: true }, { name: 'variant[option_value_ids][]', class: 'select2-clear form-control', id: "option_value_ids-#{option_type.id}"  } %>
+            <% end %>
+          </div>
+        <% end %>
+      </div>
+    </div>
+  </div>
+<% end %>

config/locales/en.yml

@@ -266,6 +266,7 @@ en:
         type: "Type"
         select_date: "Select Date"
         taxon: "Taxon"
+        quantity: "Quantity"
       spree/report:
         cashier: "Cashier"
     errors:

config/routes.rb

@@ -172,7 +172,11 @@
       end
       resources :vendors
       resources :customers do
-        resources :subscriptions
+        resources :subscriptions do
+          collection do
+            get :load_option_types_form
+          end
+        end
         resources :addresses
       end
       resources :roles
@@ -219,6 +223,10 @@
         resources :homepage_section_relatable_options
       end
 
+      namespace :billing do
+        resources :variants, only: %i[index show]
+      end
+
       namespace :storefront do
         resource :cart, controller: :cart, only: %i[show create destroy] do
           patch :restart_checkout_flow

db/migrate/20240119110257_add_quantity_to_cm_customers.rb

@@ -0,0 +1,5 @@
+class AddQuantityToCmCustomers < ActiveRecord::Migration[7.0]
+  def change
+    add_column :cm_customers, :quantity, :integer, default: 1, if_not_exists: true
+  end
+end