comee_core 0.1.99 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3b5b69ffae3e2702ed23106fbc360890ec375ae49c97a136b98baad2fec89d8
-  data.tar.gz: 5fc14c0bac612232d3d32bf4c2f1f0e98e75773adb2aa343d1b73387f8b92bac
+  metadata.gz: 2d7cf157e4f4751fc575616de0c6828c89b2fff51cf7dcd28347feb7f668ad6b
+  data.tar.gz: 1dac2167d8e7419c2312ec89cf8e8276f56ed1ca6ef0ac6a71e24ec432cec1bf
 SHA512:
-  metadata.gz: 986aff6f5d73b35a540a16fbbdafc62a2c03911a6cd06430de431fa30f547994ec3038d90d38e37a8504f36547cb3f519f9804cc8828a54942b08b49752d2884
-  data.tar.gz: c4add758cc2d3c861a10b0c584f96abac453928bacd0ad5375150bc56233323d4c95a0aa5f617cfe036884efad323b900c39dc6579ae4baaa6fa7d4c0c3fd3a4
+  metadata.gz: 88c434b7eb17e6dba7c24911369d03128f0eaeed66409a5e6c1bce86b1648948ce07d6e4472c12c2bc3ada0aad59c79c8a9644921cb977c873c48b8aaab2bbec
+  data.tar.gz: 6307f0083025d5473b9a7bf14a1f43070bf4590e8a2c890070e203cc64842fc8c692dc721ea248aed3c606321962df6bf372269aabbf4e9bb6a7a8adcdca1367

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

@@ -9,6 +9,52 @@ module Comee
         end
       end
 
+      def create
+        super do
+          price = ClientPrice.new(model_params)
+          master_price = MasterPrice.find_by(product_id: price.product_id, primary: true)
+          price.price = master_price&.selling_price
+          if price.price
+            price.price = price.margin_increase? ? price.price * (1 + price.margin / 100) : price.price * (1 - price.margin / 100)
+          end
+          price
+        end
+      end
+
+      def update
+        if @obj.draft?
+          product_id = model_params[:product_id] || @obj.product_id
+          master_price = MasterPrice.find_by(product_id: product_id, primary: true)
+          @obj.price = master_price&.selling_price
+          if @obj.price
+            @obj.price = @obj.margin_increase? ? @obj.price * (1 + @obj.margin / 100) : @obj.price * (1 - @obj.margin / 100)
+          end
+          if @obj.update(model_params)
+            render_content(@obj)
+          else
+            render json: {success: false, error: @obj.errors.full_messages[0]}, status: :unprocessable_entity
+          end
+        else
+          error = "Client price should be in draft state to edit."
+          render json: {success: false, error: error}, status: :unprocessable_entity
+        end
+      rescue StandardError => e
+        render json: {success: false, error: e.message}
+      end
+
+      def extend_validity
+        price = ClientPrice.find(params[:id])
+        if price.draft?
+          render json: {success: false, error: "Price must be an approved price for validity extension."}
+        else
+          price.valid_to = extend_params[:valid_to]
+          price.save!
+          render_content(price)
+        end
+      rescue StandardError => e
+        render json: {success: false, error: e.message}
+      end
+
       def fetch_for_client
         client = Client.find(params[:id])
         client_id = client.parent_id || client.id
@@ -17,6 +63,14 @@ module Comee
         render_content(prices)
       end
 
+      def approve
+        price = ClientPrice.find(params[:id])
+        price = price.approve
+        render_content(price)
+      rescue StandardError => e
+        render json: {success: false, error: e.message}, status: :unprocessable_entity
+      end
+
       def filter
         prices = ClientPrice.includes(:client, :product, :unit, :product_lookup)
                             .ransack(params[:q]).result
@@ -26,9 +80,13 @@ module Comee
       private
 
       def model_params
-        params.require(:payload).permit(:valid_from, :valid_to, :price, :product_id, :margin, :margin_type, :client_id, :previous_price,
+        params.require(:payload).permit(:valid_from, :valid_to, :product_id, :margin, :margin_type, :client_id, :previous_price,
                                         :unit_id)
       end
+
+      def extend_params
+        params.require(:payload).permit(:valid_to)
+      end
     end
   end
 end

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

@@ -60,7 +60,7 @@ module Comee
       def model_params
         params.require(:payload).permit(:order_number, :customer_order_id, :payment_penalty, :payment_term, :delivery_term, :status,
                                         :fulfillment_center_id, :total_price, :amount_paid, :pallete_note, :handover_date, :remark,
-                                        :client_id, files: [])
+                                        :consignee, :client_id, files: [])
       end
 
       def back_order_params

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

@@ -61,7 +61,7 @@ module Comee
 
       def model_params
         params.require(:payload).permit(:sales_order_item_id, :quantity, :shipment_status, :status, :handover_date, :delivery_date,
-                                        :pallet_no)
+                                        :pallet_no, :consignee, :order_number)
       end
     end
   end

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

@@ -5,6 +5,10 @@ module Comee
       belongs_to :client
 
       validates :url, :processed, presence: true
+
+      def self.ransackable_attributes(_auth_object = nil)
+        %w[client_id id order_source_id processed]
+      end
     end
   end
 end

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

@@ -23,6 +23,14 @@ module Comee
         end
       end
 
+      def margin_increase?
+        ClientPrice.margin_types[margin_type] == ClientPrice.margin_types[:increase]
+      end
+
+      def margin_discount?
+        ClientPrice.margin_types[margin_type] == ClientPrice.margin_types[:discount]
+      end
+
       def self.ransackable_attributes(_auth_object = nil)
         %w[
           id

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

@@ -2,7 +2,7 @@ module Comee
   module Core
     class ItemStatus < ApplicationRecord
       INITIALIZED = "Initialized".freeze
-      DELIVERY_NOTE_CREATED = "Delivery note created".freeze
+      DELIVERY_NOTE_CREATED = "Delivery Note Created".freeze
       COMPLETELY_PICKED_AND_PACKED = "Completely Picked & Packed".freeze
       PARTIALLY_PICKED_AND_PACKED = "Partially Picked & Packed".freeze
 

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

@@ -23,6 +23,14 @@ module Comee
         errors.add(:base, "Price validity date range is not correct.") unless period.valid?
       end
 
+      def draft?
+        Price.price_statuses[price_status] == Price.price_statuses[:draft]
+      end
+
+      def approved?
+        Price.price_statuses[price_status] == Price.price_statuses[:approved]
+      end
+
       def compute_status
         period = Period.new(valid_from, valid_to)
         if period.past?
@@ -34,6 +42,16 @@ module Comee
         end
       end
 
+      def approve
+        if Price.price_statuses[price_status] == Price.price_statuses[:approved]
+          raise(StandardError, "Price status is already in approved state.")
+        end
+
+        self.price_status = Price.price_statuses[:approved]
+        save!
+        self
+      end
+
       def past?
         Price.statuses[status] == Price.statuses[:past]
       end

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

@@ -6,7 +6,7 @@ module Comee
       belongs_to :sales_order_item
       has_many :item_statuses
 
-      validates :handover_date, :delivery_date, :shipment_status, :status, presence: true
+      validates :handover_date, :delivery_date, :shipment_status, :status, :order_number, presence: true
       validates :quantity, presence: true, numericality: {greater_than: 0}
 
       def self.ransackable_attributes(_auth_object = nil)

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

@@ -1,7 +1,7 @@
 module Comee
   module Core
     class ClientPriceSerializer < ActiveModel::Serializer
-      attributes :id, :valid_from, :valid_to, :price, :status, :previous_price, :margin, :margin_type
+      attributes :id, :valid_from, :valid_to, :price, :status, :price_status, :previous_price, :margin, :margin_type
       belongs_to :product
       belongs_to :client
       belongs_to :unit

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

@@ -1,7 +1,8 @@
 module Comee
   module Core
     class MasterPriceSerializer < ActiveModel::Serializer
-      attributes :id, :purchase_price, :selling_price, :valid_from, :valid_to, :primary, :margin, :lead_time, :status
+      attributes :id, :purchase_price, :selling_price, :valid_from, :valid_to, :primary, :margin, :lead_time, :status,
+                 :price_status
       belongs_to :product
       belongs_to :supplier
       belongs_to :product_lookup

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

@@ -2,7 +2,7 @@ module Comee
   module Core
     class SalesOrderSerializer < ActiveModel::Serializer
       attributes :id, :order_number, :payment_penalty, :status, :total_price, :payment_term, :delivery_term, :amount_paid,
-                 :pallete_note, :handover_date, :remark, :parent_client_name, :created_by, :files_url, :customs_detail
+                 :pallete_note, :handover_date, :remark, :parent_client_name, :created_by, :files_url, :customs_detail, :consignee
       belongs_to :customer_order
       belongs_to :client
       belongs_to :fulfillment_center

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

@@ -1,7 +1,8 @@
 module Comee
   module Core
     class ShipmentItemSerializer < ActiveModel::Serializer
-      attributes :id, :quantity, :shipment_status, :status, :handover_date, :delivery_date, :pallet_no
+      attributes :id, :quantity, :shipment_status, :status, :handover_date, :delivery_date, :pallet_no, :consignee,
+                 :order_number
       belongs_to :sales_order_item
     end
   end

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

@@ -141,6 +141,7 @@ module Comee
             customer_order: order,
             status: SalesOrder.statuses[:draft],
             client: order.client,
+            consignee: order.consignee,
             created_by: accepted_by || ""
           )
           order_items = order.customer_order_items.includes(:product, :unit)

data/config/routes.rb

@@ -93,8 +93,15 @@ Comee::Core::Engine.routes.draw do
     end
   end
   resources :agents
-  post "/client_prices/filter", controller: :client_prices, action: :filter
-  resources :client_prices
+  resources :client_prices do
+    member do
+      post "extend_validity"
+      post "approve"
+    end
+    collection do
+      post "filter"
+    end
+  end
   post "/back_orders/filter", controller: :back_orders, action: :filter
   resources :back_orders do
     member do

data/db/migrate/20230812190652_create_comee_core_sales_orders.rb

@@ -14,6 +14,7 @@ class CreateComeeCoreSalesOrders < ActiveRecord::Migration[7.0]
                    null: false,
                    index: {name: "client_on_ccso_indx"},
                    foreign_key: {to_table: :comee_core_clients}
+      t.string :consignee
       t.string :parent_client_name
       t.string :payment_term
       t.string :delivery_term

data/db/migrate/20231207153420_create_comee_core_shipment_items.rb

@@ -11,6 +11,8 @@ class CreateComeeCoreShipmentItems < ActiveRecord::Migration[7.1]
       t.date :handover_date, null: false
       t.date :delivery_date, null: false
       t.string :pallet_no
+      t.string :consignee
+      t.string :order_number, null: false
 
       t.timestamps
     end

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.1.99".freeze
+    VERSION = "0.2.1".freeze
   end
 end

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

@@ -22,5 +22,9 @@ FactoryBot.define do
       valid_from { Date.current.advance(months: 1) }
       valid_to { Date.current.advance(months: 2) }
     end
+
+    trait :approved do
+      price_status { Comee::Core::Price.price_statuses[:approved] }
+    end
   end
 end

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

@@ -11,6 +11,7 @@ FactoryBot.define do
     amount_paid { 0 }
     status { Comee::Core::SalesOrder.statuses[:draft] }
     pallete_note { Faker::Lorem.sentence }
+    consignee { Faker::Name.name }
     remark { Faker::Lorem.sentence }
     parent_client_name { Faker::Name.name }
     created_by { Faker::Name.name }

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

@@ -7,5 +7,7 @@ FactoryBot.define do
     handover_date { Date.current.advance(days: 3) }
     delivery_date { Date.current.advance(days: 6) }
     pallet_no { Faker::Alphanumeric.alpha(number: 10) }
+    consignee { Faker::Name.name }
+    order_number { sales_order_item.sales_order.order_number }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.1.99
+  version: 0.2.1
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-21 00:00:00.000000000 Z
+date: 2024-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers