comee_core 0.2.49 → 0.2.51

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 067fb1956bf9f0c318d443ac1bc3e57c92b98a7db3afcdaf0a4d0869a5df7989
-  data.tar.gz: c70a6b57d486b4029dc66f4e07e3d8dce94ab3695b0623a582e8e5573e9b1120
+  metadata.gz: 3cefcb81eb41e5db7078a2de7c478cf2cf477bd747272e684a6acb7590f4df22
+  data.tar.gz: 355d9461d9208c214a99819e78242923d37027ec909e70e59d47021ce30700b1
 SHA512:
-  metadata.gz: d3ac1e81c9d58317182cd37e470e4f92516201bddf1d77fc2c5e5412b045dfc340d8c55b6dea389f07059fc6c683bc825d1b25a23102dbbd319f83317e80d26e
-  data.tar.gz: 943ec3ba980dbdfe273afa930fa30f7ad6200ff5085ee6552aec2af978012e8a933e23a0dacc94b2389792c262de0f1bf4dc9d09622864bf10111cbbaa8723df
+  metadata.gz: dfa1546039693c3138a202c59391fc169c579b465c9ede57808f9c61f7995324108cd25cbb79d7527bcfcd95e9b0205e2fa9c2687c5b34a6a07a3998fa4a26de
+  data.tar.gz: 5f9ea82e05e6467269bc8cf9fd5815c87dad8668df654ad8a5a0ce17bd94daa77e48415349c718f304de4212f82b94538c10f553dba4a96bed42a29a4134e93e

data/app/controllers/comee/core/sales_order_items_controller.rb

@@ -27,6 +27,18 @@ module Comee
         render_content(item)
       end
 
+      def cancel_quantity
+        item = set_object
+        to_cancel = cancel_quantity_params[:quantity]
+        raise(StandardError, "Quantity to cancel is greater than available quantity.") if to_cancel > item.quantity_remaining
+
+        item.quantity_canceled += to_cancel
+        item.save!
+        render_content(item)
+      rescue StandardError => e
+        render_error(e)
+      end
+
       def activate
         item = set_object
         item.update(canceled: false)
@@ -45,10 +57,15 @@ module Comee
       end
 
       def model_params
-        params.require(:payload).permit(:sales_order_id, :customer_order_item_id, :product_id, :unit_id, :quantity, :quantity_delivered,
-                                        :customer_item_no, :customer_item_description, :price, :handover_date, :delivery_date,
-                                        :eb_number, :lead_time, :comment, :action_note, :purchase_order_item_id, :pallet_no, :source_id,
-                                        :processing_status)
+        params.require(:payload)
+              .permit(:sales_order_id, :customer_order_item_id, :product_id, :unit_id, :quantity, :quantity_delivered,
+                      :quantity_canceled, :customer_item_no, :customer_item_description, :price, :handover_date,
+                      :delivery_date, :eb_number, :lead_time, :comment, :action_note, :purchase_order_item_id, :pallet_no,
+                      :source_id, :processing_status)
+      end
+
+      def cancel_quantity_params
+        params.require(:payload).permit(:quantity)
       end
     end
   end

data/app/controllers/comee/core/sales_orders_controller.rb

@@ -2,7 +2,7 @@ module Comee
   module Core
     class SalesOrdersController < ApplicationController
       include Common
-      before_action :set_service, only: %i[submit confirm cancel]
+      before_action :set_service, only: %i[submit confirm accept cancel]
 
       def index
         super do
@@ -75,6 +75,13 @@ module Comee
         render json: {success: false, error: e.message}
       end
 
+      def accept
+        order = @service.accept(params[:id])
+        render_content(order)
+      rescue StandardError => e
+        render json: {success: false, error: e.message}
+      end
+
       def cancel
         order = @service.cancel(params[:id])
         render_content(order)

data/app/models/comee/core/purchase_order.rb

@@ -13,7 +13,8 @@ module Comee
         submitted: 1,
         approved: 2,
         confirmed: 3,
-        canceled: 4
+        accepted: 4,
+        canceled: 5
       }
 
       def total_price
@@ -24,6 +25,7 @@ module Comee
       def self.ransackable_attributes(_auth_object = nil)
         %w[
           id
+          po_number
           supplier_id
           unit_id
           order_date

data/app/models/comee/core/purchase_order_item.rb

@@ -15,6 +15,8 @@ module Comee
       validates :price, presence: true, numericality: {greater_than_or_equal_to: 0}
       validates :status, :delivery_date, presence: true
 
+      delegate(:po_number, to: :purchase_order, prefix: false)
+
       def calculate_total_price
         self.total_price = price * quantity
       end

data/app/models/comee/core/sales_order.rb

@@ -11,7 +11,7 @@ module Comee
       has_many_attached :files
       has_one :customs_detail
 
-      enum :status, {draft: 0, submitted: 1, confirmed: 2, canceled: 3}
+      enum :status, {draft: 0, submitted: 1, confirmed: 2, accepted: 3, canceled: 4}
 
       validates :order_number, presence: true, uniqueness: true
       validates :order_date, :status, presence: true

data/app/models/comee/core/sales_order_item.rb

@@ -15,12 +15,18 @@ module Comee
 
       validates :customer_item_no, :customer_item_description, :delivery_date, :processing_status, presence: true
       validates :quantity, :price, presence: true, numericality: {greater_than: 0}
-      validates :quantity_delivered, numericality: {greater_than_or_equal_to: 0}
+      validates :quantity_delivered, :quantity_canceled, numericality: {greater_than_or_equal_to: 0}
+
+      delegate(:po_number, to: :purchase_order_item, prefix: false, allow_nil: true)
 
       def calculate_total_price
         self.total_price = price * quantity
       end
 
+      def quantity_remaining
+        quantity - (quantity_delivered + quantity_canceled)
+      end
+
       def self.ransackable_attributes(_auth_object = nil)
         %w[
           id

data/app/models/comee/core/supplier_invoice.rb

@@ -2,7 +2,6 @@ module Comee
   module Core
     class SupplierInvoice < ApplicationRecord
       belongs_to :purchase_order
-      has_many :supplier_invoice_items
       has_many :supplier_payments
 
       enum :status, {draft: 0, approved: 1}

data/app/serializers/comee/core/sales_order_item_serializer.rb

@@ -1,10 +1,9 @@
 module Comee
   module Core
     class SalesOrderItemSerializer < ActiveModel::Serializer
-      attributes :id, :customer_item_no, :customer_item_description, :quantity, :quantity_delivered, :price, :handover_date,
-                 :delivery_date, :eb_number, :lead_time, :comment, :action_note, :purchase_order_item_id, :total_price, :canceled,
-                 :processing_status
-
+      attributes :id, :customer_item_no, :customer_item_description, :quantity, :quantity_delivered, :quantity_canceled,
+                 :price, :handover_date, :delivery_date, :eb_number, :lead_time, :comment, :action_note, :purchase_order_item_id,
+                 :total_price, :canceled, :processing_status
       belongs_to :sales_order
       belongs_to :customer_order_item
       belongs_to :source

data/app/services/comee/core/sales_order_service.rb

@@ -141,9 +141,7 @@ module Comee
         order = SalesOrder.find_by(id: id)
         raise(StandardError, "Sales order with id `#{id}` not found.") unless order
 
-        unless SalesOrder.statuses[order.status] == SalesOrder.statuses[:draft]
-          raise(StandardError, "Sales order should be in draft state.")
-        end
+        raise(StandardError, "Sales order should be in draft state.") unless order.draft?
 
         raise(StandardError, "Sales order should have at least one item.") unless order.sales_order_items.count.positive?
 
@@ -153,13 +151,25 @@ module Comee
         order
       end
 
+      # def approve(id)
+      #   order = SalesOrder.find_by(id: id)
+      #   raise(StandardError, "Sales order with id `#{id}` not found.") unless order
+
+      #   raise(StandardError, "Sales order should be in submitted state.") unless order.submitted?
+
+      #   raise(StandardError, "Sales order should have at least one item.") unless order.sales_order_items.count.positive?
+
+      #   raise(StandardError, "All items are canceled for sales order.") if order.sales_order_items.all?(&:canceled?)
+
+      #   order.update!(status: SalesOrder.statuses[:approved])
+      #   order
+      # end
+
       def confirm(id)
         order = SalesOrder.find_by(id: id)
         raise(StandardError, "Sales order with id `#{id}` not found.") unless order
 
-        unless SalesOrder.statuses[order.status] == SalesOrder.statuses[:submitted]
-          raise(StandardError, "Sales order should be in submitted state.")
-        end
+        raise(StandardError, "Sales order should be in submitted state.") unless order.submitted?
 
         raise(StandardError, "Sales order should have at least one item.") unless order.sales_order_items.count.positive?
 
@@ -169,11 +179,25 @@ module Comee
         order
       end
 
+      def accept(id)
+        order = SalesOrder.find_by(id: id)
+        raise(StandardError, "Sales order with id `#{id}` not found.") unless order
+
+        raise(StandardError, "Sales order should be in confirmed state.") unless order.confirmed?
+
+        raise(StandardError, "Sales order should have at least one item.") unless order.sales_order_items.count.positive?
+
+        raise(StandardError, "All items are canceled for sales order.") if order.sales_order_items.all?(&:canceled?)
+
+        order.update!(status: SalesOrder.statuses[:accepted])
+        order
+      end
+
       def cancel(id)
         order = SalesOrder.find_by(id: id)
         raise(StandardError, "Sales order with id `#{id}` not found.") unless order
 
-        raise(StandardError, "Sales order is already canceled.") if SalesOrder.statuses[order.status] == SalesOrder.statuses[:canceled]
+        raise(StandardError, "Sales order is already canceled.") if order.canceled?
 
         order.update!(status: SalesOrder.statuses[:canceled])
         order

data/config/routes.rb

@@ -111,6 +111,7 @@ Comee::Core::Engine.routes.draw do
       post "suggest", controller: :sales_order_items, action: :suggest_values
       post "cancel"
       post "activate"
+      post "cancel_quantity"
     end
   end
   resources :shipment_items do
@@ -128,6 +129,7 @@ Comee::Core::Engine.routes.draw do
       get "items", controller: :sales_order_items, action: :index
       post "submit"
       post "confirm"
+      post "accept"
       post "cancel"
     end
   end

data/db/migrate/20230728123823_create_comee_core_purchase_orders.rb

@@ -10,6 +10,7 @@ class CreateComeeCorePurchaseOrders < ActiveRecord::Migration[7.1]
       t.integer :status, default: 0
       t.string :delivery_address, null: false
       t.date :delivery_date, null: false
+      t.float :total_price, default: 0
       t.string :terms
 
       t.timestamps

data/db/migrate/20230812212844_create_comee_core_sales_order_items.rb

@@ -29,6 +29,7 @@ class CreateComeeCoreSalesOrderItems < ActiveRecord::Migration[7.0]
       t.string :customer_item_description, null: false
       t.float :quantity, null: false
       t.float :quantity_delivered, null: false, default: 0
+      t.float :quantity_canceled, null: false, default: 0
       t.float :price, null: false
       t.float :total_price, null: false
       t.date :delivery_date, null: false

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.2.49".freeze
+    VERSION = "0.2.51".freeze
   end
 end

data/spec/factories/comee/core/sales_order_items.rb

@@ -10,6 +10,7 @@ FactoryBot.define do
     customer_item_description { Faker::Lorem.sentence }
     quantity { 100 }
     quantity_delivered { 0 }
+    quantity_canceled { 0 }
     price { 50 }
     total_price { quantity * price }
     delivery_date { Date.current.advance(months: 1) }

data/spec/factories/comee/core/sales_orders.rb

@@ -24,5 +24,21 @@ FactoryBot.define do
     pallete_note { Faker::Lorem.sentence }
     remark { Faker::Lorem.sentence }
     created_by { Faker::Name.name }
+
+    trait :submitted do
+      status { Comee::Core::SalesOrder.statuses[:submitted] }
+    end
+
+    trait :confirmed do
+      status { Comee::Core::SalesOrder.statuses[:confirmed] }
+    end
+
+    trait :accepted do
+      status { Comee::Core::SalesOrder.statuses[:accepted] }
+    end
+
+    trait :canceled do
+      status { Comee::Core::SalesOrder.statuses[:canceled] }
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.2.49
+  version: 0.2.51
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-29 00:00:00.000000000 Z
+date: 2024-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -345,7 +345,6 @@ files:
 - app/models/comee/core/shipment_item.rb
 - app/models/comee/core/supplier.rb
 - app/models/comee/core/supplier_invoice.rb
-- app/models/comee/core/supplier_invoice_item.rb
 - app/models/comee/core/supplier_payment.rb
 - app/models/comee/core/time_slot.rb
 - app/models/comee/core/transport_availability.rb
@@ -443,9 +442,7 @@ files:
 - db/migrate/20240314111117_create_comee_core_purchase_requisitions.rb
 - db/migrate/20240314111307_create_comee_core_purchase_requisition_items.rb
 - db/migrate/20240325155406_create_comee_core_purchase_order_item_diffs.rb
-- db/migrate/20240328033103_add_total_price_to_purchase_order.rb
 - db/migrate/20240328132454_create_comee_core_supplier_invoices.rb
-- db/migrate/20240328132625_create_comee_core_supplier_invoice_items.rb
 - db/migrate/20240328132713_create_comee_core_payment_orders.rb
 - db/migrate/20240328132921_create_comee_core_supplier_payments.rb
 - lib/comee/core.rb
@@ -497,7 +494,6 @@ files:
 - spec/factories/comee/core/shipment_instruction_items.rb
 - spec/factories/comee/core/shipment_instructions.rb
 - spec/factories/comee/core/shipment_items.rb
-- spec/factories/comee/core/supplier_invoice_items.rb
 - spec/factories/comee/core/supplier_invoices.rb
 - spec/factories/comee/core/supplier_payments.rb
 - spec/factories/comee/core/suppliers.rb

data/app/models/comee/core/supplier_invoice_item.rb

@@ -1,20 +0,0 @@
-module Comee
-  module Core
-    class SupplierInvoiceItem < ApplicationRecord
-      before_save { self.total_price = unit_price * quantity }
-      after_save :update_invoice_price
-
-      belongs_to :purchase_order_item
-      belongs_to :supplier_invoice
-      belongs_to :unit
-
-      validates :quantity, :unit_price, presence: true, numericality: {greater_than: 0}
-      validates :total_price, numericality: {greater_than_or_equal_to: 0, allow_nil: true}
-
-      def update_invoice_price
-        supplier_invoice.total_price = supplier_invoice.supplier_invoice_items.sum(:total_price)
-        supplier_invoice.save!
-      end
-    end
-  end
-end

data/db/migrate/20240328033103_add_total_price_to_purchase_order.rb

@@ -1,5 +0,0 @@
-class AddTotalPriceToPurchaseOrder < ActiveRecord::Migration[7.1]
-  def change
-    add_column :comee_core_purchase_orders, :total_price, :float, default: 0
-  end
-end

data/db/migrate/20240328132625_create_comee_core_supplier_invoice_items.rb

@@ -1,23 +0,0 @@
-class CreateComeeCoreSupplierInvoiceItems < ActiveRecord::Migration[7.1]
-  def change
-    create_table :comee_core_supplier_invoice_items do |t|
-      t.references :purchase_order_item,
-                   null: false,
-                   index: {name: "poi_on_ccsii_indx"},
-                   foreign_key: {to_table: :comee_core_purchase_order_items}
-      t.references :supplier_invoice,
-                   null: false,
-                   index: {name: "si_on_ccsii2_indx"},
-                   foreign_key: {to_table: :comee_core_supplier_invoices}
-      t.float :quantity, null: false
-      t.references :unit,
-                   null: false,
-                   index: {name: "unit_on_ccsii2_indx"},
-                   foreign_key: {to_table: :comee_core_units}
-      t.float :unit_price, null: false
-      t.float :total_price
-
-      t.timestamps
-    end
-  end
-end

data/spec/factories/comee/core/supplier_invoice_items.rb

@@ -1,10 +0,0 @@
-FactoryBot.define do
-  factory :supplier_invoice_item, class: "Comee::Core::SupplierInvoiceItem" do
-    purchase_order_item
-    supplier_invoice
-    quantity { 10 }
-    unit
-    unit_price { 5 }
-    total_price { quantity * unit_price }
-  end
-end