comee_core 0.1.63 → 0.1.65

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7799ea96479660919b2feddcb0ef645e8345a0fcd76d0a964d16444b128cd8a1
-  data.tar.gz: 3260186fbe16cfaed82416e5ccaf76a039aa9fca284a01ba3fc8ef7c1797c9bd
+  metadata.gz: 52af84253c893c7cd0227d8f90bf1cfc08122dddd244dc08b43a35cb37d1e023
+  data.tar.gz: '088941a03a3d82ce6139ee9dbbe37184efc8b5f14dfc28bbedc8c7cc01713359'
 SHA512:
-  metadata.gz: 6075b7c40bf2255b933d80bcaafc54ec3a45bfd237f5c0759bd47830e0d66b382c97a92a33eb0d82f9974867e2b508036b716bfa451a0c26e67936883f87b753
-  data.tar.gz: 11e4007cd8d5606f29deca92f6d9fbb801fc3867cee39052440d1e45fb40e11607db1e7dd11284ecac5428e2455e11f2c10abf078565d6ea6d947d88d394ddb7
+  metadata.gz: 594acab1ee9e374d297fd00251ec3abffa8a3b3f7fe10aef418fd6209d310a4f55376d1dfac93a3948375afcbf196ff4d0bb4e748b6d83e5acb3087208d5c00f
+  data.tar.gz: 39b42c4dea22968643c0a782850fe981599936983494b3621beeeb055d31a7f4f104f040bb5b81d6b658dc9242e21e2b11c326ae6362003914060e7de4cbddc3

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

@@ -35,7 +35,8 @@ module Comee
       private
 
       def model_params
-        params.required(:payload).permit(:code, :name, :description, :parent_id, :thumbnail_image, :preferred_units, :source_id, images: [])
+        params.required(:payload).permit(:code, :name, :description, :parent_id, :thumbnail_image, :preferred_units, :source_id, :weight,
+                                         :weight_unit_id, :dimensions, :hs_code, :hs_description, images: [])
       end
 
       def price_params

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

@@ -25,12 +25,39 @@ module Comee
         render json: {success: true}
       end
 
+      def filter_with_status
+        items = SalesOrderItem.includes(:sales_order, :product, :unit)
+                              .ransack(params[:q]).result
+        statuses = ItemStatus.where(sales_order_item_id: items.map(&:id))
+                             .select("MAX(id) AS max_id, sales_order_item_id")
+                             .group(:sales_order_item_id)
+                             .all
+        ids = statuses.map(&:max_id)
+        statuses = ItemStatus.where(id: ids).each_with_object({}) { |status, res| res[status.sales_order_item_id] = status }
+        result = items.each_with_object([]) do |item, res|
+          status = statuses[item.id]
+          data = {
+            sales_order_no: item.sales_order.order_number,
+            customer_item_no: item.customer_item_no,
+            product_code: item.product.code,
+            unit: item.unit.code,
+            quantity: item.quantity,
+            delivery_date: item.delivery_date,
+            handover_date: item.sales_order.handover_date,
+            po_reference: item.po_reference,
+            status: status&.status
+          }
+          res << data.merge(status&.details)
+        end
+        render json: {success: true, data: result}
+      end
+
       private
 
       def model_params
         params.require(:payload).permit(:sales_order_id, :customer_order_item_id, :product_id, :unit_id, :quantity, :quantity_delivered,
                                         :customer_item_no, :price, :delivery_date, :eb_number, :lead_time, :comment, :action_note,
-                                        :po_reference, :source_id)
+                                        :po_reference, :pallet_no, :source_id)
       end
     end
   end

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

@@ -49,8 +49,9 @@ module Comee
       private
 
       def model_params
-        params.require(:payload).permit(:order_number, :customer_order_id, :payment_penalty, :status, :fulfillment_center_id,
-                                        :total_price, :amount_paid, :pallete_note, :handover_date, :remark, files: [])
+        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,
+                                        files: [])
       end
 
       def back_order_params

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

@@ -8,6 +8,7 @@ module Comee
       has_many_attached :images
 
       belongs_to :source, class_name: "Comee::Core::FulfillmentCenter", optional: true
+      belongs_to :weight_unit, class_name: "Comee::Core::Unit", optional: true
 
       validates :code, presence: true, uniqueness: true
       validates :name, presence: true

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

@@ -12,6 +12,22 @@ module Comee
       validates :customer_item_no, :delivery_date, presence: true
       validates :quantity, :price, presence: true, numericality: {greater_than: 0}
       validates :quantity_delivered, numericality: {greater_than_or_equal_to: 0}
+
+      def self.ransackable_attributes(_auth_object = nil)
+        %w[
+          customer_item_no
+          customer_order_item_id
+          delivery_date
+          eb_number
+          handover_date
+          lead_time
+          po_reference
+          product_id
+          sales_order_id
+          source_id
+          unit_id
+        ]
+      end
     end
   end
 end

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

@@ -1,8 +1,10 @@
 module Comee
   module Core
     class ProductSerializer < ActiveModel::Serializer
-      attributes :id, :code, :name, :description, :thumbnail_image_url, :images_url, :preferred_units
+      attributes :id, :code, :name, :description, :thumbnail_image_url, :images_url, :preferred_units, :weight, :dimensions, :hs_code,
+                 :hs_description
       belongs_to :source
+      belongs_to :weight_unit
     end
   end
 end

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

@@ -2,10 +2,12 @@ module Comee
   module Core
     class SalesOrderItemSerializer < ActiveModel::Serializer
       attributes :id, :customer_item_no, :quantity, :quantity_delivered, :price, :delivery_date, :eb_number, :lead_time, :comment,
-                 :action_note, :po_reference, :product, :unit
+                 :action_note, :po_reference, :pallet_no
 
+      belongs_to :sales_order
       belongs_to :customer_order_item
       belongs_to :source
+      belongs_to :product
       belongs_to :unit
     end
   end

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

@@ -1,8 +1,8 @@
 module Comee
   module Core
     class SalesOrderSerializer < ActiveModel::Serializer
-      attributes :id, :order_number, :payment_penalty, :status, :total_price,
-                 :amount_paid, :pallete_note, :handover_date, :remark, :files_url
+      attributes :id, :order_number, :payment_penalty, :status, :total_price, :payment_term, :delivery_term, :amount_paid, :pallete_note,
+                 :handover_date, :remark, :files_url
       belongs_to :customer_order
       belongs_to :fulfillment_center
       has_many :sales_order_items

data/config/routes.rb

@@ -77,6 +77,10 @@ Comee::Core::Engine.routes.draw do
     member do
       get "suggest", controller: :sales_order_items, action: :suggest_values
     end
+
+    collection do
+      post "filter_with_status"
+    end
   end
   post "/sales_orders/filter", controller: :sales_orders, action: :filter
   resources :sales_orders do

data/db/migrate/20230728014322_create_comee_core_products.rb

@@ -7,6 +7,14 @@ class CreateComeeCoreProducts < ActiveRecord::Migration[7.0]
       t.boolean :leaf, null: false, default: true
       t.string :ancestry
       t.jsonb :preferred_units, null: false, default: []
+      t.float :weight
+      t.references :weight_unit,
+                   null: true,
+                   index: {name: "wu_on_ccp_indx"},
+                   foreign_key: {to_table: :comee_core_units}
+      t.string :dimensions
+      t.string :hs_code
+      t.string :hs_description
       t.references :source,
                    null: true,
                    index: {name: "source_on_ccp_indx"},

data/db/migrate/20230812190652_create_comee_core_sales_orders.rb

@@ -10,6 +10,8 @@ class CreateComeeCoreSalesOrders < ActiveRecord::Migration[7.0]
                    null: true,
                    index: {name: "fc_on_ccso_indx"},
                    foreign_key: {to_table: :comee_core_fulfillment_centers}
+      t.string :payment_term
+      t.string :delivery_term
       t.float :payment_penalty, null: false, default: 0.0
       t.integer :status, null: false, default: 0
       t.float :total_price, null: false, default: 0

data/db/migrate/20230812212844_create_comee_core_sales_order_items.rb

@@ -33,6 +33,7 @@ class CreateComeeCoreSalesOrderItems < ActiveRecord::Migration[7.0]
       t.string :comment
       t.string :action_note
       t.string :po_reference
+      t.string :pallet_no
 
       t.timestamps
     end

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.1.63".freeze
+    VERSION = "0.1.65".freeze
   end
 end

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

@@ -9,6 +9,11 @@ FactoryBot.define do
     leaf { true }
     ancestry { root.id.to_s }
     preferred_units { [] }
+    weight { 10 }
+    weight_unit factory: :unit
+    dimensions { "2cm x 3cm x 1cm" }
+    hs_code { Faker::Alphanumeric.alpha(number: 10) }
+    hs_description { Faker::Lorem.sentence }
     source factory: :fulfillment_center
   end
 end

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

@@ -16,5 +16,6 @@ FactoryBot.define do
     comment { Faker::Lorem.sentence }
     action_note { Faker::Lorem.sentence }
     po_reference { Faker::Alphanumeric.alpha(number: 10) }
+    pallet_no { Faker::Alphanumeric.alpha(number: 10) }
   end
 end

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

@@ -3,6 +3,8 @@ FactoryBot.define do
     order_number { Faker::Alphanumeric.alpha(number: 10) }
     customer_order
     fulfillment_center
+    payment_term { Faker::Lorem.sentence }
+    delivery_term { Faker::Lorem.sentence }
     payment_penalty { 0 }
     total_price { 0 }
     amount_paid { 0 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.1.63
+  version: 0.1.65
 platform: ruby
 authors:
 - Henock L.