feat: maximumx order quantity for order article

yksflip · yksflip · commit 2f32e39553fb · 2025-07-09T12:42:48.000+02:00
diff --git a/app/assets/javascripts/article-form.js b/app/assets/javascripts/article-form.js
@@ -13,6 +13,7 @@ class ArticleForm {
       this.supplierUnitSelect$ = $(`#${this.unitFieldsIdPrefix}_supplier_order_unit`, this.articleForm$);
       this.unitRatiosTable$ = $('#fc_base_price', this.articleForm$);
       this.minimumOrderQuantity$ = $(`#${this.unitFieldsIdPrefix}_minimum_order_quantity`, this.articleForm$);
+      this.maximumOrderQuantity$ = $(`#${this.unitFieldsIdPrefix}_maximum_order_quantity`, this.articleForm$);
       this.billingUnit$ = $(`#${this.unitFieldsIdPrefix}_billing_unit`, this.articleForm$);
       this.groupOrderGranularity$ = $(`#${this.unitFieldsIdPrefix}_group_order_granularity`, this.articleForm$);
       this.groupOrderUnit$ = $(`#${this.unitFieldsIdPrefix}_group_order_unit`, this.articleForm$);
diff --git a/app/controllers/order_articles_controller.rb b/app/controllers/order_articles_controller.rb
@@ -26,7 +26,7 @@ def create
   end
 
   def update
-    version_params = params.require(:article_version).permit(:id, :unit, :supplier_order_unit, :minimum_order_quantity,
+    version_params = params.require(:article_version).permit(:id, :unit, :supplier_order_unit, :minimum_order_quantity, :maximum_order_quantity,
                                                              :billing_unit, :group_order_granularity, :group_order_unit, :price, :price_unit, :tax, :deposit, article_unit_ratios_attributes: %i[id sort quantity unit _destroy])
     @order_article.update_handling_versioning!(params[:order_article], version_params)
   rescue StandardError
diff --git a/app/models/article.rb b/app/models/article.rb
@@ -158,6 +158,7 @@ def unequal_attributes(new_article, options = {})
         unit: [latest_article_version.unit, new_unit],
         supplier_order_unit: [latest_article_version.supplier_order_unit, new_article.supplier_order_unit],
         minimum_order_quantity: [latest_article_version.minimum_order_quantity, new_article.minimum_order_quantity],
+        maximum_order_quantity: [latest_article_version.maximum_order_quantity, new_article.maximum_order_quantity],
         billing_unit: [latest_article_version.billing_unit || latest_article_version.supplier_order_unit,
                        new_article.billing_unit || new_article.supplier_order_unit],
         group_order_granularity: [latest_article_version.group_order_granularity, new_article.group_order_granularity],
diff --git a/app/models/article_version.rb b/app/models/article_version.rb
@@ -41,7 +41,7 @@ class ArticleVersion < ApplicationRecord
   validates :group_order_granularity, numericality: { greater_than_or_equal_to: 0 }
   validates :deposit, :tax, numericality: true
   validates :minimum_order_quantity, numericality: { allow_nil: true }
-
+  validates :maximum_order_quantity, numericality: { allow_nil: true }
   # validates_uniqueness_of :name, :scope => [:supplier_id, :deleted_at, :type], if: Proc.new {|a| a.supplier.shared_sync_method.blank? or a.supplier.shared_sync_method == 'import' }
   # validates_uniqueness_of :name, :scope => [:supplier_id, :deleted_at, :type, :unit, :unit_quantity]
   validate :uniqueness_of_name
@@ -122,6 +122,20 @@ def minimum_order_quantity=(value)
     end
   end
 
+  def maximum_order_quantity=(value)
+    if value.blank?
+      self[:maximum_order_quantity] = nil
+    else
+      value = value.gsub(I18n.t('number.format.separator'), '.') if value.is_a?(String)
+      begin
+        value = value.to_i if Float(value) % 1 == 0
+      rescue ArgumentError
+        # not any number -> let validation handle this
+      end
+      super(value)
+    end
+  end
+
   def self_or_ratios_changed?
     changed? || @article_unit_ratios_changed || article_unit_ratios.any?(&:changed?)
   end
diff --git a/app/models/group_order.rb b/app/models/group_order.rb
@@ -54,14 +54,19 @@ def load_data
           used_tolerance: (goa ? goa.result(:tolerance) : 0),
           total_price: (goa ? goa.total_price : 0),
           missing_units: order_article.missing_units,
-          ratio_group_order_unit_supplier_unit: order_article.article_version.convert_quantity(1,
-                                                                                               order_article.article_version.supplier_order_unit, order_article.article_version.group_order_unit),
-          quantity_available: (order.stockit? ? order_article.article_version.article.quantity_available : 0),
+          ratio_group_order_unit_supplier_unit: order_article.article_version.convert_quantity(1, order_article.article_version.supplier_order_unit, order_article.article_version.group_order_unit),
           minimum_order_quantity: if order_article.article_version.minimum_order_quantity
                                     order_article.article_version.convert_quantity(
                                       order_article.article_version.minimum_order_quantity, order_article.article_version.supplier_order_unit, order_article.article_version.group_order_unit
                                     )
-                                  end
+                                  end,
+          quantity_available: (if order.stockit?
+                                 order_article.article_version.article.quantity_available
+                               elsif order_article.article_version.maximum_order_quantity
+                                 order_article.article_version.convert_quantity(
+                                   [order_article.article_version.maximum_order_quantity - order_article.quantity + goa.quantity, 0].max, order_article.article_version.supplier_order_unit, order_article.article_version.group_order_unit
+                                 )
+                               end)
         }
       end
     end
diff --git a/app/models/order_article.rb b/app/models/order_article.rb
@@ -81,6 +81,7 @@ def update_results!
   #      4        |    5     |     4     |           2
   #
   def calculate_units_to_order(quantity, tolerance = 0)
+    quantity = [price.maximum_order_quantity || quantity, quantity].min
     return 0 if !price.minimum_order_quantity.nil? && quantity + tolerance < price.minimum_order_quantity
     return price.minimum_order_quantity if quantity > 0 && !price.minimum_order_quantity.nil? && quantity < price.minimum_order_quantity && quantity + tolerance >= price.minimum_order_quantity
 
diff --git a/app/views/articles/_edit_all_table.html.haml b/app/views/articles/_edit_all_table.html.haml
@@ -56,6 +56,10 @@
                 = form.input :minimum_order_quantity, label: "Mininum order quantity" do
                   .input-append
                     = form.input_field :minimum_order_quantity, class: 'input-mini', title: "total minimum order quantity for this article"
+              .fold-line
+                = form.input :maximum_order_quantity, label: "Mininum order quantity" do
+                  .input-append
+                    = form.input_field :maximum_order_quantity, class: 'input-mini', title: "total minimum order quantity for this article"
               .fold-line
                 = form.input :billing_unit, as: :select, collection: [], input_html: {'data-initial-value': article.billing_unit, class: 'input-medium'}, include_blank: false
               .fold-line
diff --git a/app/views/articles/_sync_table.html.haml b/app/views/articles/_sync_table.html.haml
@@ -76,6 +76,13 @@
                     %span.add-on
                     - unless changed_article.new_record?
                       %p.help-block{style: 'color: grey;'}=article.minimum_order_quantity.to_s
+              .fold-line
+                = form.input :maximum_order_quantity, label: "Maximum order quantity" do
+                  .input-append
+                    = form.input_field :maximum_order_quantity, class: 'input-mini', style: highlight_new(attrs, :maximum_order_quantity), title: "total maximum order quantity for this article"
+                    %span.add-on
+                    - unless changed_article.new_record?
+                      %p.help-block{style: 'color: grey;'}=article.maximum_order_quantity.to_s
               .fold-line
                 = form.input :billing_unit, hint: changed_article.new_record? ? nil : ArticleUnitsLib.get_translated_name_for_code(article.billing_unit || article.supplier_order_unit), hint_html: {style: 'color: grey;'}, as: :select, collection: [], input_html: {'data-initial-value': changed_article.billing_unit, class: 'input-medium', style: highlight_new(attrs, :billing_unit)}, include_blank: false
               .fold-line
diff --git a/app/views/articles/upload.html.haml b/app/views/articles/upload.html.haml
@@ -12,6 +12,7 @@
       %th= Article.human_attribute_name(:custom_unit)
       %th= Article.human_attribute_name(:ratios_to_supplier_order_unit)
       %th= Article.human_attribute_name(:minimum_order_quantity)
+      %th= Article.human_attribute_name(:maximum_order_quantity)
       %th= Article.human_attribute_name(:billing_unit)
       %th= Article.human_attribute_name(:group_order_granularity)
       %th= Article.human_attribute_name(:group_order_unit)
diff --git a/app/views/group_orders/_form.html.haml b/app/views/group_orders/_form.html.haml
@@ -126,7 +126,7 @@
                   %i.icon-minus
                 %a.btn.btn-ordering.increase
                   %i.icon-plus
-                %input.goa-quantity{type: "number", name: "group_order[group_order_articles_attributes][#{order_article.id}][quantity]", value: @ordering_data[:order_articles][order_article.id][:quantity], data: quantity_data, autocomplete: 'off', class: 'input-mini numeric', style: ('display:none' if @order.stockit?), min: 0, max: (@ordering_data[:order_articles][order_article.id][:quantity_available] if @order.stockit?), step: order_article.article_version.group_order_granularity}
+                %input.goa-quantity{type: "number", name: "group_order[group_order_articles_attributes][#{order_article.id}][quantity]", value: @ordering_data[:order_articles][order_article.id][:quantity], data: quantity_data, autocomplete: 'off', class: 'input-mini numeric', style: ('display:none' if @order.stockit?), min: 0, max: (@ordering_data[:order_articles][order_article.id][:quantity_available]), step: order_article.article_version.group_order_granularity}
               %span.numeric-step-error
                 = t('errors.step_error', granularity: order_article.article_version.group_order_granularity, min: 0)
 
diff --git a/app/views/shared/_article_fields_units.html.haml b/app/views/shared/_article_fields_units.html.haml
@@ -26,6 +26,11 @@
     .input-append
       = f.input_field :minimum_order_quantity, class: 'input-mini'
       %span.add-on
+.fold-line
+  = f.input :maximum_order_quantity do
+    .input-append
+      = f.input_field :maximum_order_quantity, class: 'input-mini'
+      %span.add-on
 .fold-line
   = f.input :billing_unit, as: :select, collection: [], input_html: {'data-initial-value': article.billing_unit, class: 'input-medium'}, include_blank: false
 .fold-line
diff --git a/db/migrate/20250709100306_add_maximum_order_quantity_to_article_versions.rb b/db/migrate/20250709100306_add_maximum_order_quantity_to_article_versions.rb
@@ -0,0 +1,5 @@
+class AddMaximumOrderQuantityToArticleVersions < ActiveRecord::Migration[7.0]
+  def change
+    add_column :article_versions, :maximum_order_quantity, :float
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.0].define(version: 2025_05_23_191049) do
+ActiveRecord::Schema[7.0].define(version: 2025_07_09_100306) do
   create_table "action_text_rich_texts", charset: "utf8mb4", collation: "utf8mb4_general_ci", force: :cascade do |t|
     t.string "name", null: false
     t.text "body", size: :long
@@ -94,6 +94,7 @@
     t.string "group_order_unit"
     t.decimal "group_order_granularity", precision: 8, scale: 3, default: "1.0", null: false
     t.float "minimum_order_quantity"
+    t.float "maximum_order_quantity"
     t.index ["article_category_id"], name: "index_article_versions_on_article_category_id"
     t.index ["article_id", "created_at"], name: "index_article_versions_on_article_id_and_created_at", unique: true
   end
diff --git a/spec/models/order_article_spec.rb b/spec/models/order_article_spec.rb
@@ -268,4 +268,64 @@ def goa_reload
       end
     end
   end
+
+  describe 'calculate_units_to_order with si unit_quantity' do
+    let(:article) { create(:article, unit_quantity: 3) }
+    let(:order) { create(:order, article_ids: [article.id]) }
+    let(:oa) { order.order_articles.first }
+
+    it 'simple case' do
+      expect(oa.calculate_units_to_order(6)).to eq 2
+    end
+
+    it 'with tolerance' do
+      expect(oa.calculate_units_to_order(5, 0)).to eq 1
+      expect(oa.calculate_units_to_order(5, 1)).to eq 2
+    end
+
+    it 'minimum order quantity' do
+      oa.article_version.update_attribute :minimum_order_quantity, 6
+      expect(oa.calculate_units_to_order(3)).to eq 0
+      expect(oa.calculate_units_to_order(6)).to eq 2
+    end
+
+    it 'maximum order quantity' do
+      oa.article_version.update_attribute :maximum_order_quantity, 6
+      expect(oa.calculate_units_to_order(9)).to eq 2
+    end
+  end
+
+  describe 'calculate_units_to_order with article_version' do
+    let(:article_version) { create(:article_version, article_unit_ratios: [create(:article_unit_ratio, quantity: 3)]) }
+    let(:article) { article_version.article }
+    let(:order) { create(:order, article_ids: [article.id]) }
+    let(:oa) { order.order_articles.first }
+
+    it 'simple case' do
+      expect(oa.calculate_units_to_order(3)).to eq 1
+    end
+
+    it 'with tolerance' do
+      expect(oa.calculate_units_to_order(5, 0)).to eq 1
+      expect(oa.calculate_units_to_order(5, 1)).to eq 2
+    end
+
+    it 'minimum order quantity' do
+      oa.article_version.update_attribute :minimum_order_quantity, 6
+      expect(oa.calculate_units_to_order(3)).to eq 0
+      expect(oa.calculate_units_to_order(6)).to eq 2
+    end
+
+    it 'maximum order quantity' do
+      oa.article_version.update_attribute :maximum_order_quantity, 6
+      expect(oa.calculate_units_to_order(9)).to eq 2
+    end
+
+    it 'maximum and minimum' do
+      oa.article_version.update_attribute :maximum_order_quantity, 9
+      oa.article_version.update_attribute :minimum_order_quantity, 6
+      expect(oa.calculate_units_to_order(12)).to eq 3
+      expect(oa.calculate_units_to_order(3)).to eq 0
+    end
+  end
 end

Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,7 @@ def update_results!`
`81`	`81`	`# 4 \| 5 \| 4 \| 2`
`82`	`82`	`#`
`83`	`83`	`def calculate_units_to_order(quantity, tolerance = 0)`
	`84`	`+ quantity = [price.maximum_order_quantity \|\| quantity, quantity].min`
`84`	`85`	`return 0 if !price.minimum_order_quantity.nil? && quantity + tolerance < price.minimum_order_quantity`
`85`	`86`	`return price.minimum_order_quantity if quantity > 0 && !price.minimum_order_quantity.nil? && quantity < price.minimum_order_quantity && quantity + tolerance >= price.minimum_order_quantity`
`86`	`87`