comee_core 0.1.21 → 0.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4110e9f1c5556d8d519e9c4853886b4bdc836aee47a8e01f990f7d640f5a7144
-  data.tar.gz: bd9a6c43ddd0d57a46cf57518fa21afe77430844a29923b0815d34de8ad9f80b
+  metadata.gz: 3a430ac3b0edb3d903589fc39cc548fee51235223e69f86463e9d17900417c28
+  data.tar.gz: 59601bbacfb140b0ad870f1b9a3c24d8a3218da8a3e096f969d8848846f5973b
 SHA512:
-  metadata.gz: 2f9c11ca22065eff7004b72ca5494381469256775c2b4d3d391fc5d35640fe1a7e1fc64ef7a51f9d5f94f78281b350dd9fe21f62753a93fa648ca5e235f1d796
-  data.tar.gz: 482433b0bf10ee4450ad5e93e811ae5c2db81461a991abd3c34a8bc49e0f57a8112a1e8294110d7bb695528d16376d2ade64ecef8e9bfd8e416f59727b937a5e
+  metadata.gz: 61165752dd893e613c16d3e020aa4049b356d6967248c699efd2b9d7ff85ec28a95934b857f12d350022ea1bb70512fb0e4d75556f30c10765185486dd98256c
+  data.tar.gz: 66ca0c7a8726797243347c47c7ca985b66ff67ded63f8fb05ac8119e5d9d1250084714f4c12f83d4a31efd768b98ee345623deb7021662d030ae0980ac13dda8

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

@@ -0,0 +1,34 @@
+module Comee
+  module Core
+    class BackOrdersController < ApplicationController
+      include Common
+      before_action :set_object, only: %i[show update submit]
+
+      def index
+        super do
+          Comee::Core::BackOrder.includes(:back_order_items, :supplier)
+        end
+      end
+
+      def submit
+        ActiveRecord::Base.transaction do
+          @obj.submit
+          Comee::Core::BackOrderNotification.with(back_order: @obj).deliver(@obj.supplier.user)
+          render json: {success: true, data: serialize(@obj.reload)}
+        end
+      rescue => e
+        render json: {success: false, error: e.message}
+      end
+
+      def filter
+        query = Comee::Core::BackOrder.ransack(params[:q])
+        render json: {success: true, data: serialize(query.result.includes(:back_order_items, :supplier))}
+      end
+
+      def model_params
+        params.require(:payload).permit(:order_number, :order_date, :delivery_date, :supplier_id, :terms,
+          :delivery_address, :invoice_address, :status, :remark)
+      end
+    end
+  end
+end

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

@@ -1,9 +1,7 @@
 module Comee
   module Core
     class BackOrder < ApplicationRecord
-      enum :status, {draft: 0, submitted: 1, confirmed: 2}
-
-      after_create_commit :notify_supplier
+      enum :status, {draft: 0, submitted: 1, confirmed: 2, accepted: 3}
 
       belongs_to :supplier
       has_many :back_order_items
@@ -38,10 +36,11 @@ module Comee
         save!
       end
 
-      private
+      def submit
+        raise(StandardError, "Back order can't be submitted if it is not in draft state.") unless BackOrder.statuses[status] == BackOrder.statuses[:draft]
 
-      def notify_supplier
-        Comee::Core::NewOrderNotification.with(back_order: self).deliver_later(supplier.user)
+        self.status = BackOrder.statuses[:submitted]
+        save
       end
     end
   end

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

@@ -6,8 +6,9 @@ module Comee
       belongs_to :back_order
       belongs_to :product
 
-      validates :item_status, presence: true
-      validates :requested_quantity, :requested_unit_price, :supplier_quantity, :supplier_unit_price, presence: true, numericality: {greater_than: 0}
+      validates :item_status, :from, :to, presence: true
+      validates :requested_quantity, :requested_unit_price, :supplier_quantity, :supplier_unit_price,
+        presence: true, numericality: {greater_than: 0}
 
       delegate(:code, :name, :description, to: :product, prefix: true)
       delegate(:unit_code, :unit_name, to: :product, prefix: false)

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

@@ -2,6 +2,7 @@ module Comee
   module Core
     class Client < ApplicationRecord
       belongs_to :user, optional: true
+      has_many :warehouse_shipments
 
       validates :code, :name, :address, :locale, presence: true
       validates :code, uniqueness: true

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

@@ -0,0 +1,9 @@
+module Comee
+  module Core
+    class Inventory < ApplicationRecord
+      belongs_to :product
+
+      validates :quantity, presence: true, numericality: {greater_than: 0}
+    end
+  end
+end

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

@@ -1,11 +1,12 @@
 module Comee
   module Core
     class MasterPrice < ApplicationRecord
+      enum :status, {old: 0, current: 1, future: 2}
       belongs_to :supplier
       belongs_to :product
       belongs_to :previous_price, class_name: "Comee::Core::MasterPrice", optional: true
 
-      validates :purchase_price, :selling_price, :pp_valid_from, :pp_valid_to, :sp_valid_from, :sp_valid_to, presence: true
+      validates :purchase_price, :status, :selling_price, :pp_valid_from, :pp_valid_to, :sp_valid_from, :sp_valid_to, presence: true
       validates :margin, presence: true, numericality: {greater_than_or_equal_to: 0, less_than_or_equal_to: 100}
       validates :product_id, uniqueness: {scope: [:supplier_id, :previous_price_id]}
       validate :validate_primary_price, :validate_purchase_price_validity_dates, :validate_selling_price_validity_dates

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

@@ -3,6 +3,7 @@ module Comee
     class Product < ApplicationRecord
       belongs_to :product_type
       belongs_to :unit
+      has_many :inventories
 
       validates :code, presence: true, uniqueness: true
       validates :name, presence: true

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

@@ -2,12 +2,16 @@ module Comee
   module Core
     class SalesOrderItem < ApplicationRecord
       before_validation :set_delivery_date, if: proc { delivery_date.nil? }
+      before_validation :update_quantity_remaining, if: proc { quantity_remaining.nil? }
 
       belongs_to :sales_order
       belongs_to :product
+      has_many :warehouse_shipment_items
 
       validates :delivery_date, presence: true
       validates :quantity, :price, presence: true, numericality: {greater_than: 0}
+      validates :quantity_en_route, numericality: {greater_than_or_equal_to: 0}
+      validates :quantity_remaining, numericality: {greater_than: 0}
 
       delegate(:name, to: :product, prefix: true)
       delegate(:code, to: :product, prefix: true)
@@ -15,6 +19,24 @@ module Comee
       def set_delivery_date
         self.delivery_date = sales_order.expected_delivery_date
       end
+
+      def update_quantity_remaining
+        self.quantity_remaining = quantity
+        if quantity_en_route_changed? && quantity_en_route_was > 0 && quantity_en_route == 0
+          self.quantity_remaining -= quantity_en_route_was
+        end
+      end
+
+      def update_quantity_en_route(quantity)
+        self.quantity_en_route = quantity
+        save
+      end
+
+      def confirm_delivery
+        self.quantity_remaining -= quantity_en_route
+        self.quantity_en_route = 0
+        save
+      end
     end
   end
 end

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

@@ -0,0 +1,13 @@
+module Comee
+  module Core
+    class WarehouseShipment < ApplicationRecord
+      belongs_to :client
+      has_many :warehouse_shipment_items
+
+      enum :status, {draft: 0, submitted: 1, acknowledged: 2, delivered: 3}
+
+      validates :reference_number, presence: true, uniqueness: true
+      validates :destination, :delivery_date, :status, presence: true
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+module Comee
+  module Core
+    class WarehouseShipmentItem < ApplicationRecord
+      after_create :update_inventory_and_sales_order_item
+
+      belongs_to :warehouse_shipment
+      belongs_to :sales_order_item
+
+      validates :quantity, presence: true
+
+      def update_inventory_and_sales_order_item
+        update_inventory(sales_order_item.product_id, quantity)
+
+        sales_order_item.update_quantity_en_route(quantity)
+      end
+
+      def update_inventory(product_id, quantity_change)
+        inventory = Inventory.find_by(product_id: product_id)
+        if inventory
+          inventory.quantity -= quantity_change
+          inventory.save
+        end
+      end
+    end
+  end
+end

data/app/notifications/comee/core/{new_order_notification.rb → back_order_notification.rb}

@@ -1,6 +1,6 @@
 module Comee
   module Core
-    class NewOrderNotification < Noticed::Base
+    class BackOrderNotification < Noticed::Base
       deliver_by :database
       deliver_by :email, mailer: "Comee::Core::SupplierMailer", method: :new_order_notification
 

data/config/routes.rb

@@ -21,4 +21,10 @@ Comee::Core::Engine.routes.draw do
   resources :clients
   post "/client_prices/filter", controller: :client_prices, action: :filter
   resources :client_prices
+  post "/back_orders/filter", controller: :back_orders, action: :filter
+  resources :back_orders do
+    member do
+      post "submit"
+    end
+  end
 end

data/db/migrate/20230728125723_create_comee_core_back_order_items.rb

@@ -13,6 +13,8 @@ class CreateComeeCoreBackOrderItems < ActiveRecord::Migration[7.0]
       t.float :requested_unit_price, null: false
       t.float :supplier_quantity, null: false
       t.float :supplier_unit_price, null: false
+      t.date :from, null: false
+      t.date :to, null: false
       t.integer :item_status, null: false, default: 0
       t.string :remark
 

data/db/migrate/20230813235946_create_comee_core_master_prices.rb

@@ -6,6 +6,7 @@ class CreateComeeCoreMasterPrices < ActiveRecord::Migration[7.0]
       t.date :pp_valid_from, null: false
       t.date :pp_valid_to, null: false
       t.date :sp_valid_from, null: false
+      t.float :status, null: false, default: 0
       t.date :sp_valid_to, null: false
       t.boolean :active, null: false
       t.boolean :primary, null: false

data/db/migrate/20231003073316_create_comee_core_inventories.rb

@@ -0,0 +1,13 @@
+class CreateComeeCoreInventories < ActiveRecord::Migration[7.0]
+  def change
+    create_table :comee_core_inventories do |t|
+      t.references :product,
+        null: false,
+        index: {name: "product_on_cci_indx"},
+        foreign_key: {to_table: :comee_core_products}
+      t.integer :quantity, null: false
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20231003080017_create_comee_core_warehouse_shipments.rb

@@ -0,0 +1,17 @@
+class CreateComeeCoreWarehouseShipments < ActiveRecord::Migration[7.0]
+  def change
+    create_table :comee_core_warehouse_shipments do |t|
+      t.string :reference_number, null: false
+      t.string :destination, null: false
+      t.date :delivery_date, null: false
+      t.references :client,
+        null: false,
+        index: {name: "client_on_ccws_indx"},
+        foreign_key: {to_table: :comee_core_clients}
+      t.integer :status, null: false, default: 0
+
+      t.timestamps
+    end
+    add_index :comee_core_warehouse_shipments, :reference_number, unique: true
+  end
+end

data/db/migrate/20231004105455_create_comee_core_warehouse_shipment_items.rb

@@ -0,0 +1,17 @@
+class CreateComeeCoreWarehouseShipmentItems < ActiveRecord::Migration[7.0]
+  def change
+    create_table :comee_core_warehouse_shipment_items do |t|
+      t.references :warehouse_shipment,
+        null: false,
+        index: {name: "ws_on_ccwsi_indx"},
+        foreign_key: {to_table: :comee_core_warehouse_shipments}
+      t.references :sales_order_item,
+        null: false,
+        index: {name: "soi_on_ccwsi_indx"},
+        foreign_key: {to_table: :comee_core_sales_order_items}
+      t.integer :quantity, null: false
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20231008115247_add_quantity_to_comee_core_sales_order_item.rb

@@ -0,0 +1,6 @@
+class AddQuantityToComeeCoreSalesOrderItem < ActiveRecord::Migration[7.0]
+  def change
+    add_column :comee_core_sales_order_items, :quantity_remaining, :integer
+    add_column :comee_core_sales_order_items, :quantity_en_route, :integer, default: 0
+  end
+end

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.1.21"
+    VERSION = "0.1.23"
   end
 end

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

@@ -6,6 +6,8 @@ FactoryBot.define do
     requested_unit_price { 50 }
     supplier_quantity { 5 }
     supplier_unit_price { 55 }
+    from { Date.current }
+    to { Date.current.advance(months: 1) }
     item_status { Comee::Core::BackOrderItem.item_statuses[:available] }
   end
 end

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

@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :inventory, class: "Comee::Core::Inventory" do
+    quantity { 10 }
+    product
+  end
+end

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

@@ -1,7 +1,7 @@
 FactoryBot.define do
   factory :notification, class: "Comee::Core::Notification" do
     recipient { create(:user) }
-    type { "Comee::Core::NewOrderNotification" }
+    type { "Comee::Core::BackOrderNotification" }
     params { {back_order: create(:back_order)} }
     read_at { Date.current }
   end

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

@@ -3,6 +3,8 @@ FactoryBot.define do
     sales_order
     product
     quantity { 100 }
+    quantity_en_route { 0 }
+    quantity_remaining { 100 }
     price { 50 }
     delivery_date { Date.current.advance(months: 1) }
   end

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

@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :warehouse_shipment_item, class: "Comee::Core::WarehouseShipmentItem" do
+    warehouse_shipment
+    sales_order_item
+    quantity { 10 }
+  end
+end

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

@@ -0,0 +1,9 @@
+FactoryBot.define do
+  factory :warehouse_shipment, class: "Comee::Core::WarehouseShipment" do
+    reference_number { Faker::Alphanumeric.alpha(number: 8) }
+    destination { Faker::Lorem.sentence }
+    delivery_date { Date.current.advance(month: 1) }
+    status { Comee::Core::WarehouseShipment.statuses[:draft] }
+    client
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.1.21
+  version: 0.1.23
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-11 00:00:00.000000000 Z
+date: 2023-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -220,6 +220,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.30.1
+- !ruby/object:Gem::Dependency
+  name: letter_opener
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: An engine which contains core models and end-points for the COMee ERP.
 email:
 - henockl@live.com
@@ -232,6 +246,7 @@ files:
 - Rakefile
 - app/controllers/comee/core/access_controller.rb
 - app/controllers/comee/core/application_controller.rb
+- app/controllers/comee/core/back_orders_controller.rb
 - app/controllers/comee/core/client_prices_controller.rb
 - app/controllers/comee/core/clients_controller.rb
 - app/controllers/comee/core/currencies_controller.rb
@@ -253,6 +268,7 @@ files:
 - app/models/comee/core/client_price.rb
 - app/models/comee/core/currency.rb
 - app/models/comee/core/field_mapping.rb
+- app/models/comee/core/inventory.rb
 - app/models/comee/core/invoice.rb
 - app/models/comee/core/invoice_item.rb
 - app/models/comee/core/master_price.rb
@@ -266,7 +282,9 @@ files:
 - app/models/comee/core/supplier.rb
 - app/models/comee/core/unit.rb
 - app/models/comee/core/user.rb
-- app/notifications/comee/core/new_order_notification.rb
+- app/models/comee/core/warehouse_shipment.rb
+- app/models/comee/core/warehouse_shipment_item.rb
+- app/notifications/comee/core/back_order_notification.rb
 - app/serializers/comee/core/client_price_serializer.rb
 - app/serializers/comee/core/client_serializer.rb
 - app/serializers/comee/core/currency_serializer.rb
@@ -305,6 +323,10 @@ files:
 - db/migrate/20230929115336_create_comee_core_order_sources.rb
 - db/migrate/20230929120051_create_comee_core_field_mappings.rb
 - db/migrate/20230929130910_create_comee_core_client_orders.rb
+- db/migrate/20231003073316_create_comee_core_inventories.rb
+- db/migrate/20231003080017_create_comee_core_warehouse_shipments.rb
+- db/migrate/20231004105455_create_comee_core_warehouse_shipment_items.rb
+- db/migrate/20231008115247_add_quantity_to_comee_core_sales_order_item.rb
 - lib/comee/core.rb
 - lib/comee/core/engine.rb
 - lib/comee/core/version.rb
@@ -317,6 +339,7 @@ files:
 - spec/factories/comee/core/clients.rb
 - spec/factories/comee/core/currencies.rb
 - spec/factories/comee/core/field_mappings.rb
+- spec/factories/comee/core/inventories.rb
 - spec/factories/comee/core/invoice_items.rb
 - spec/factories/comee/core/invoices.rb
 - spec/factories/comee/core/master_prices.rb
@@ -330,6 +353,8 @@ files:
 - spec/factories/comee/core/suppliers.rb
 - spec/factories/comee/core/units.rb
 - spec/factories/comee/core/users.rb
+- spec/factories/comee/core/warehouse_shipment_items.rb
+- spec/factories/comee/core/warehouse_shipments.rb
 homepage: https://www.mks.com
 licenses:
 - MIT