spree_group_buy 0.0.1

data/app/models/spree/product_decorator.rb

@@ -0,0 +1,8 @@
+module Spree::ProductDecorator
+  def self.prepended(base)
+    base.has_many :group_buys, class_name: 'Spree::GroupBuy'
+    base.has_many :active_group_buys, -> { where(state: 'active') }, class_name: 'Spree::GroupBuy'
+  end
+end
+
+Spree::Product.prepend Spree::ProductDecorator

data/app/models/spree/stock/packer_decorator.rb

@@ -0,0 +1,27 @@
+module Spree::Stock::PackerDecorator
+
+      def default_package
+        package = Spree::Stock::Package.new(stock_location)
+
+        # Group by line_item_id instead of variant_id.
+        # in case of same variant_id of different line_item with group_buy_id enabled
+        inventory_units.index_by(&:line_item_id).each do |line_item_id, inventory_unit|
+          variant = Spree::Variant.find(inventory_unit.variant_id)
+          unit = inventory_unit.dup # Can be used by others, do not use directly
+          if variant.should_track_inventory?
+            next unless stock_location.stocks? variant
+
+            on_hand, backordered = stock_location.fill_status(variant, unit.quantity)
+            package.add(Spree::InventoryUnit.split(unit, backordered), :backordered) if backordered.positive?
+            package.add(Spree::InventoryUnit.split(unit, on_hand), :on_hand) if on_hand.positive?
+          else
+            package.add unit
+          end
+        end
+
+        package
+      end
+
+end
+
+Spree::Stock::Packer.prepend Spree::Stock::PackerDecorator

data/app/models/spree/stock/prioritizer_decorator.rb

@@ -0,0 +1,18 @@
+module Spree::Stock::PrioritizerDecorator
+
+	  # use also line_item to differentiate each package item
+	  # in case of same variant_id of different line_item with group_buy_id enabled
+      def hash_item(item)
+        shipment = item.inventory_unit.shipment
+        variant  = item.inventory_unit.variant
+        line_item = item.inventory_unit.line_item
+        if shipment.present?
+          variant.hash ^ line_item.hash ^ shipment.hash
+        else
+          variant.hash ^ line_item.hash
+        end
+      end
+
+end
+
+Spree::Stock::Prioritizer.prepend Spree::Stock::PrioritizerDecorator

data/app/services/spree/cart/group_buy_add_item.rb

@@ -0,0 +1,66 @@
+module Spree
+  module Cart
+    class GroupBuyAddItem
+      prepend Spree::ServiceModule::Base
+
+      def call(order:, variant:, quantity: nil, options: {})
+        ApplicationRecord.transaction do
+          run :add_to_line_item
+          run Spree::Dependencies.cart_recalculate_service.constantize
+        end
+      end
+
+      private
+
+      def add_to_line_item(order:, variant:, quantity: nil, options: {})
+        options ||= {}
+        quantity ||= 1
+
+        if options.key? :groupBuyId
+          # finder by variant_id and group_buy_id
+          line_item = order.line_items.detect do |line_item|
+            line_item.variant_id == variant.id && line_item.group_buy_id == options[:groupBuyId].to_i 
+          end
+        else
+          line_item = order.line_items.detect do |line_item|
+            line_item.variant_id == variant.id && line_item.group_buy_id.nil?
+          end
+
+          # line_item = Spree::Dependencies.line_item_by_variant_finder.constantize.new.execute(order: order, variant: variant, options: options)
+        end
+        
+
+        line_item_created = line_item.nil?
+        if line_item.nil?
+          opts = ::Spree::PermittedAttributes.line_item_attributes.flatten.each_with_object({}) do |attribute, result|
+            result[attribute] = options[attribute]
+          end.merge(currency: order.currency).delete_if { |_key, value| value.nil? }
+
+          line_item = order.line_items.new(quantity: quantity,
+                                           variant: variant,
+                                           options: opts)
+        else
+          line_item.quantity += quantity.to_i
+        end
+
+        line_item.target_shipment = options[:shipment] if options.key? :shipment
+        line_item.group_buy_id = options[:groupBuyId].to_i if options.key? :groupBuyId
+
+        return failure(line_item) unless line_item.save
+
+        if options.key? :groupBuyId
+          line_item.price = options[:groupBuyPrice].to_f
+          line_item.save
+
+          line_item.group_buy.engaged_count += quantity.to_i
+          line_item.group_buy.save
+        else
+          line_item.reload.update_price
+        end
+        
+        ::Spree::TaxRate.adjust(order, [line_item]) if line_item_created
+        success(order: order, line_item: line_item, line_item_created: line_item_created, options: options)
+      end
+    end
+  end
+end

data/app/views/spree/admin/group_buys/_form.html.erb

@@ -0,0 +1,32 @@
+<div class="row">
+  <div data-hook="admin_variant_form_fields" class="col-12 col-md-6">
+    <div data-hook="variants">
+
+      <div class="form-group" data-hook="quantity">
+        <%= f.label :quantity, Spree.t(:quantity) %>
+        <%= f.text_field :quantity, class: 'form-control' %>
+      </div>
+
+      <div class="form-group" data-hook="price">
+        <%= f.label :price, Spree.t(:price) %>
+        <%= f.text_field :price, value: number_to_currency(@group_buy.price, unit: ''), class: 'form-control' %>
+      </div>
+
+      <div class="form-group" data-hook="expires_at">
+
+          <%= f.label :expires_at, Spree.t(:expires_at) %>
+          <%= f.error_message_on :expires_at %>
+          <%= f.text_field :expires_at, value: datepicker_field_value(@group_buy.expires_at), class: 'datepicker form-control' %>
+      </div>
+
+      <div class="form-group" data-hook="state">
+        <%= f.label :state, Spree.t(:state) %>
+        <%= select_tag 'group_buy[state]', options_for_select(['active', 'done'], @group_buy.state), class: 'select2' %>
+
+
+      </div>
+
+    </div>
+  </div>
+
+</div>

data/app/views/spree/admin/group_buys/edit.html.erb

@@ -0,0 +1,13 @@
+<%= render partial: 'spree/admin/shared/product_tabs', locals: { current: :group_buys } %>
+
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @group_buy } %>
+
+<%= form_for [:admin, @product, @group_buy] do |f| %>
+  <fieldset>
+    <div data-hook="admin_group_buy_edit_form">
+      <%= render partial: 'form', locals: { f: f } %>
+    </div>
+
+    <%= render partial: 'spree/admin/shared/edit_resource_links' %>
+  </fieldset>
+<% end %>

data/app/views/spree/admin/group_buys/index.html.erb

@@ -0,0 +1,49 @@
+<%= render 'spree/admin/shared/product_tabs', current: :group_buys %>
+<%= render 'spree/admin/shared/error_messages', target: @product %>
+
+<%# Place for new variant form %>
+<div id="new_group_buy" data-hook></div>
+
+<% if @group_buys.any? %>
+<div class="table-responsive">
+  <table class="table">
+    <thead data-hook="variants_header">
+      <tr>
+        <th><%= Spree.t(:quantity) %></th>
+        <th><%= Spree.t(:price) %></th>
+        <th><%= Spree.t(:expires_at) %></th>
+        <th><%= Spree.t(:engaged_count) %></th>
+        <th><%= Spree.t(:state) %></th>
+        <th class="actions"></th>
+      </tr>
+    </thead>
+    <tbody id="sortVert">
+    <% @group_buys.each do |group_buy| %>
+      <tr id="<%= spree_dom_id group_buy %>" data-hook="group_buys_row">
+        <td><%= group_buy.quantity %></td>
+        <td><%= group_buy.price %></td>
+        <td><%= group_buy.expires_at %></td>
+        <td><%= group_buy.engaged_count %></td>
+        <td><%= group_buy.state %></td>
+        <td class="actions actions-2 text-right">
+          <%= link_to_edit(group_buy, no_text: true) if can?(:edit, group_buy) %>
+        </td>
+      </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>
+<% else %>
+  <div class="no-objects-found alert alert-info">
+    <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::GroupBuy)) %>
+    <% if can?(:create, Spree::GroupBuy) && !@product.empty_option_values? %>
+      - <%= link_to(Spree.t(:add_one), new_admin_product_group_buy_url(@product)) %>!
+    <% end %>
+  </div>
+<% end %>
+
+
+<% content_for :page_actions do %>
+  <%= product_preview_link(@product) %>
+  <%= button_link_to(Spree.t(:new_group_buy), new_admin_product_group_buy_url(@product), { icon: 'add', :'data-update' => 'new_group_buy', class: 'btn-success', id: 'new_var_link' }) if can? :create, Spree::GroupBuy %>
+<% end %>

data/app/views/spree/admin/group_buys/new.html.erb

@@ -0,0 +1,15 @@
+<%= render partial: 'spree/admin/shared/product_tabs', locals: {current: :group_buys} %>
+
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @group_buy } %>
+
+<%= form_for [:admin, @product, @group_buy] do |f| %>
+  <div class="card mb-3 bg-light">
+    <div class="card-body">
+      <fieldset data-hook="admin_group_buy_new_form">
+        <legend class="border-bottom"><%= Spree.t(:new_group_buy) %></legend>
+        <%= render partial: 'form', locals: { f: f } %>
+        <%= render partial: 'spree/admin/shared/new_resource_links' %>
+      </fieldset>
+    </div>
+  </div>
+<% end %>

data/app/views/spree/admin/orders/index.html.erb

@@ -0,0 +1,271 @@
+<% content_for :page_title do %>
+  <%= plural_resource_name(Spree::Order) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <%= button_link_to Spree.t(:new_order),
+    new_admin_order_url,
+    class: "btn-success",
+      icon: 'add',
+      id: 'admin_new_order' %>
+<% end if can? :create, Spree::Order %>
+
+<% content_for :table_filter do %>
+  <div data-hook="admin_orders_index_search">
+
+    <%= search_form_for [:admin, @search] do |f| %>
+      <div class="row">
+        <div class="date-range-filter col-12 col-lg-8">
+          <div class="form-group">
+            <%= label_tag :q_created_at_gt, Spree.t(:date_range) %>
+            <div class="row pb-0">
+              <div class="col-12 col-lg-6">
+                <div class="input-group">
+                  <%= f.text_field :created_at_gt,
+                    class: 'datepicker datepicker-from form-control js-filterable',
+                      value: params[:q][:created_at_gt],
+                      placeholder: Spree.t(:start) %>
+                  <div class="input-group-append">
+                    <span class="input-group-text">
+                      <i class="icon icon-calendar"></i>
+                    </span>
+                  </div>
+                </div>
+
+              </div>
+              <div class="col-12 col-lg-6">
+                <div class="input-group">
+                  <%= f.text_field :created_at_lt,
+                    class: 'datepicker datepicker-to form-control js-filterable',
+                      value: params[:q][:created_at_lt],
+                      placeholder: Spree.t(:stop) %>
+                  <div class="input-group-append">
+                    <span class="input-group-text">
+                      <i class="icon icon-calendar"></i>
+                    </span>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <div class="col-12 col-lg-4">
+          <div class="form-group">
+            <%= label_tag :q_number_cont, Spree.t(:order_number, number: '') %>
+            <%= f.text_field :number_cont, class: 'form-control js-quick-search-target js-filterable' %>
+          </div>
+        </div>
+
+      </div>
+
+      <div class="row">
+
+        <div class="col-12 col-lg-4">
+          <div class="form-group">
+            <%= label_tag :q_state_eq, Spree.t(:status) %>
+            <%= f.select :state_eq,
+              Spree::Order.state_machines[:state].states.map {|s| [Spree.t("order_state.#{s.name}"), s.value]},
+              { include_blank: true },
+              class: 'select2 js-filterable' %>
+          </div>
+        </div>
+
+        <div class="col-12 col-lg-4">
+          <div class="form-group">
+            <%= label_tag :q_payment_state_eq, Spree.t(:payment_state) %>
+            <%= f.select :payment_state_eq, Spree::Order::PAYMENT_STATES.map {|s| [Spree.t("payment_states.#{s}"), s]}, { include_blank: true }, class: 'select2 js-filterable' %>
+          </div>
+        </div>
+
+        <div class="col-12 col-lg-4">
+          <div class="form-group">
+            <%= label_tag :q_shipment_state_eq, Spree.t(:shipment_state) %>
+            <%= f.select :shipment_state_eq, Spree::Order::SHIPMENT_STATES.map {|s| [Spree.t("shipment_states.#{s}"), s]}, { include_blank: true }, class: 'select2 js-filterable' %>
+          </div>
+        </div>
+
+      </div>
+
+      <div class="row">
+
+        <div class="col-12 col-lg-4">
+          <div class="form-group">
+            <%= label_tag :q_bill_address_firstname_start, Spree.t(:first_name_begins_with) %>
+            <%= f.text_field :bill_address_firstname_start, class: 'form-control js-filterable' %>
+          </div>
+        </div>
+
+        <div class="col-12 col-lg-4">
+          <div class="form-group">
+            <%= label_tag :q_bill_address_lastname_start, Spree.t(:last_name_begins_with) %>
+            <%= f.text_field :bill_address_lastname_start, class: 'form-control js-filterable' %>
+          </div>
+        </div>
+
+        <div class="col-12 col-lg-4">
+          <div class="form-group">
+            <%= label_tag :q_email_cont, Spree.t(:email) %>
+            <%= f.text_field :email_cont, class: 'form-control js-filterable' %>
+          </div>
+        </div>
+
+      </div>
+
+      <div class="row">
+
+        <div class="col-12 col-lg-4">
+          <div class="form-group">
+            <%= label_tag :q_line_items_variant_sku_eq, Spree.t(:sku) %>
+            <%= f.text_field :line_items_variant_sku_eq, class: 'form-control js-filterable' %>
+          </div>
+        </div>
+
+        <div class="col-12 col-lg-4">
+          <div class="form-group">
+            <%= label_tag :q_promotions_id_in, Spree.t(:promotion) %>
+            <%= f.select :promotions_id_in, Spree::Promotion.applied.pluck(:name, :id), { include_blank: true }, class: 'select2 js-filterable' %>
+          </div>
+        </div>
+
+        <div class="col-12 col-lg-4">
+          <div class="form-group">
+            <%= label_tag :q_store_id_in, Spree.t(:store) %>
+            <%= f.select :store_id_in, Spree::Store.order(:name).pluck(:name, :id), { include_blank: true }, class: 'select2 js-filterable' %>
+          </div>
+        </div>
+
+        <div class="col-12 col-lg-4">
+          <div class="form-group">
+            <%= label_tag :q_channel_eq, Spree.t(:channel) %>
+            <%= f.select :channel_eq, Spree::Order.distinct.pluck(:channel), { include_blank: true }, class: 'select2 js-filterable' %>
+          </div>
+        </div>
+
+        <div class="col-12 col-lg-4">
+
+          <div class="form-group">
+
+            <div class="checkbox mt-2">
+              <%= label_tag 'q_completed_at_not_null' do %>
+                <%= f.check_box :completed_at_not_null, {checked: @show_only_completed}, '1', '0' %>
+                <%= Spree.t(:show_only_complete_orders) %>
+              <% end %>
+            </div>
+
+            <div class="checkbox mt-2">
+              <%= label_tag 'q_group_buy_eq' do %>
+                <%= f.check_box :group_buy_eq, {checked: (params[:q][:group_buy_eq] == '1')}, '1', '' %>
+                <%= Spree.t(:show_only_group_buy_orders) %>
+              <% end %>
+            </div>
+
+            <div class="checkbox mt-2">
+              <%= label_tag 'q_considered_risky_eq' do %>
+                <%= f.check_box :considered_risky_eq, {checked: (params[:q][:considered_risky_eq] == '1')}, '1', '' %>
+                <%= Spree.t(:show_only_considered_risky) %>
+              <% end %>
+            </div>
+
+
+          </div>
+
+        </div>
+
+      </div>
+
+      <div data-hook="admin_orders_index_search_buttons" class="form-actions">
+        <%= button Spree.t(:filter_results), 'search' %>
+      </div>
+
+    <% end %>
+
+  </div>
+
+<% end %>
+
+<%= render 'spree/admin/shared/index_table_options', collection: @orders %>
+
+<% if @orders.any? %>
+  <table class="table" id="listing_orders" data-hook>
+    <thead>
+      <tr data-hook="admin_orders_index_headers">
+        <% if @show_only_completed %>
+          <th><%= sort_link @search, :completed_at,   I18n.t(:completed_at, scope: 'activerecord.attributes.spree/order') %></th>
+        <% else %>
+          <th><%= sort_link @search, :created_at,     I18n.t(:created_at, scope: 'activerecord.attributes.spree/order') %></th>
+        <% end %>
+        <th><%= sort_link @search, :number,           I18n.t(:number, scope: 'activerecord.attributes.spree/order') %></th>
+        <th><%= sort_link @search, :considered_risky, I18n.t(:considered_risky, scope: 'activerecord.attributes.spree/order') %></th>
+        <th><%= sort_link @search, :state,            I18n.t(:state, scope: 'activerecord.attributes.spree/order') %></th>
+        <th><%= sort_link @search, :payment_state,    I18n.t(:payment_state, scope: 'activerecord.attributes.spree/order') %></th>
+         <% if Spree::Order.checkout_step_names.include?(:delivery) %>
+          <th><%= sort_link @search, :shipment_state, I18n.t(:shipment_state, scope: 'activerecord.attributes.spree/order') %></th>
+         <% end %>
+        <th><%= sort_link @search, :email,            I18n.t(:email, scope: 'activerecord.attributes.spree/order') %></th>
+        <th><%= sort_link @search, :total,            I18n.t(:total, scope: 'activerecord.attributes.spree/order') %></th>
+        <th data-hook="admin_orders_index_header_actions" class="actions"></th>
+      </tr>
+    </thead>
+    <tbody>
+    <% @orders.each do |order| %>
+      <tr data-hook="admin_orders_index_rows" class="state-<%= order.state.downcase %> <%= cycle('odd', 'even') %>">
+        <td>
+          <%= order_time(@show_only_completed ? order.completed_at : order.created_at) %>
+        </td>
+        <td><%= link_to order.number, edit_admin_order_path(order) %></td>
+        <td>
+          <span class="badge badge-<%= order.considered_risky ? 'considered_risky' : 'considered_safe' %>">
+            <%= order.considered_risky ? Spree.t("risky") : Spree.t("safe") %>
+          </span>
+        </td>
+        <td>
+          <span class="badge badge-<%= order.state.downcase %>"><%= Spree.t("order_state.#{order.state.downcase}") %></span>
+          <span class="icon icon-filter filterable js-add-filter" data-ransack-field="q_state_eq" data-ransack-value="<%= order.state %>"></span>
+        </td>
+        <td>
+          <% if order.payment_state %>
+
+            <%= link_to Spree.t("payment_states.#{order.payment_state}"),
+              admin_order_payments_path(order),
+              class: "badge badge-#{order.payment_state}" %>
+
+            <span class="icon icon-filter filterable js-add-filter"
+              data-ransack-field="q_payment_state_eq"
+              data-ransack-value="<%= order.payment_state %>"></span>
+          <% end %>
+        </td>
+        <% if Spree::Order.checkout_step_names.include?(:delivery) %>
+          <td>
+            <% if order.shipment_state %>
+              <span class="badge badge-<%= order.shipment_state %>"><%= Spree.t("shipment_states.#{order.shipment_state}") %></span>
+              <span class="icon icon-filter filterable js-add-filter" data-ransack-field="q_shipment_state_eq" data-ransack-value="<%= order.shipment_state %>"></span>
+            <% end %>
+          </td>
+        <% end %>
+        <td>
+          <% if order.user %>
+            <%= link_to order.email, edit_admin_user_path(order.user) %>
+          <% else %>
+            <%= mail_to order.email %>
+          <% end %>
+          <% if order.user || order.email %>
+            <span class="icon icon-filter filterable js-add-filter" data-ransack-field="q_email_cont" data-ransack-value="<%= order.email %>"></span>
+          <% end %>
+        </td>
+        <td><%= order.display_total.to_html %></td>
+        <td class='actions actions-1' data-hook="admin_orders_index_row_actions">
+          <%= link_to_edit_url edit_admin_order_path(order), title: "admin_edit_#{dom_id(order)}", no_text: true if can?(:edit, order) %>
+        </td>
+      </tr>
+    <% end %>
+    </tbody>
+  </table>
+<% else %>
+  <div class="alert alert-info no-objects-found">
+    <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Order)) %>,
+    <%= link_to(Spree.t(:add_one), new_admin_order_url) if can? :create, Spree::Order %>!
+  </div>
+<% end %>
+
+<%= render 'spree/admin/shared/index_table_options', collection: @orders, simple: true %>