comee_core 0.1.91 → 0.1.92

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14e262013c470d553126a6ecad9eb449dc01732b39cf3b683b4b7e6089f6cea4
-  data.tar.gz: bf5cca3975a004dbea56eab907497cc6d1006a7ae941ff0a9d7e4bd5578f8e79
+  metadata.gz: 99b4856ac17d221660c2a0af2589f3e26d5f40930097788982e327bf3f9daa1e
+  data.tar.gz: e81f18ec5013e7c4aa47a815c2f607d1b6398fc0c616975932c5ed9bad8f7903
 SHA512:
-  metadata.gz: 49c812d17aaee3068d9b677f814cc1b3d5b8da0f6e5313e6289a7942f6ea040a8a012d477fc9ed9d540aead752c3bfe650a29b110c2af30b7c6ea0fcf3cf5e0e
-  data.tar.gz: 5886c9b99451ba968ac667d77d130ea25740c57149edc9b28a3591eb8d2841bc963a97aa118257013e4a954ef608431c53a4b67e530173e19e63afab706300ff
+  metadata.gz: 40e5ad66e287dde54881d839c4c6d9074c5ef0f7429073615faee3c9a4c2fdfa05eb29b1945747797564a407b253a348f5ce9846414c690ca2d9ca2547b7c21e
+  data.tar.gz: ce2a3221e2cd6bd668145a50afc0d765c92846f3447322ab33c2c4bc3475b6c6a5631d48c8f07535b8e7d6c1b0c354c73f96e91dad0ed5f048a61af073fe2d73

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

@@ -1,7 +1,7 @@
 module Comee
   module Core
     class ApplicationController < ActionController::API
-      include Comee::Core::Pagination
+      include Pagination
 
       before_action :authenticate
 

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

@@ -1,20 +1,20 @@
 module Comee
   module Core
     class ClientPricesController < ApplicationController
-      include Comee::Core::Common
+      include Common
 
       def index
         super do
-          client_prices = Comee::Core::ClientPrice.all
+          client_prices = ClientPrice.all
           client_prices.then(&paginate)
         end
       end
 
       def fetch_for_client
-        client = Comee::Core::Client.find(params[:id])
+        client = Client.find(params[:id])
         client_id = client.parent_id || client.id
-        prices = Comee::Core::ClientPrice.includes(:client, :product, :unit, :product_lookup)
-                                         .where(client_id: client_id)
+        prices = ClientPrice.includes(:client, :product, :unit, :product_lookup)
+                            .where(client_id: client_id)
         total = prices.count
         prices = prices.then(&paginate)
 
@@ -22,8 +22,8 @@ module Comee
       end
 
       def filter
-        prices = Comee::Core::ClientPrice.includes(:client, :product, :unit, :product_lookup)
-                                         .ransack(params[:q]).result
+        prices = ClientPrice.includes(:client, :product, :unit, :product_lookup)
+                            .ransack(params[:q]).result
         total = prices.count
         prices = prices.then(&paginate)
 

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

@@ -15,10 +15,17 @@ module Comee
         render json: {success: false, error: e.message}
       end
 
+      def shipment_addresses
+        client = Comee::Core::Client.find(params[:id])
+        render json: {success: true, data: client.shipment_addresses}
+      rescue StandardError => e
+        render json: {success: false, error: e.message}
+      end
+
       private
 
       def model_params
-        params.require(:payload).permit(:code, :name, :address, :locale, :user_id, :parent_id, consignees: [])
+        params.require(:payload).permit(:code, :name, :address, :locale, :user_id, :parent_id, consignees: [], shipment_addresses: [])
       end
     end
   end

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

@@ -25,7 +25,7 @@ module Comee
       end
 
       def accept
-        order = @service.accept(params[:id])
+        order = @service.accept(params[:id], current_user.name)
         render json: {success: true, data: serialize(order)}
       rescue StandardError => e
         render json: {success: false, error: e.message}
@@ -48,16 +48,17 @@ module Comee
       def model_params
         params.require(:payload)
               .permit(
-                :order_number, :order_date, :order_terms, :consignee, :final_destination, :final_delivery_date, :handover_date,
-                :shipping_date, :delivery_address, :invoice_address, :status, :client_id, :file
+                :order_number, :order_date, :order_terms, :consignee, :shipment_address, :final_destination,
+                :final_delivery_date, :handover_date, :shipping_date, :delivery_address, :invoice_address, :status,
+                :client_id, :file
               )
       end
 
       def create_with_item_params
         params.require(:payload)
               .permit(
-                :order_number, :order_date, :order_terms, :consignee, :final_destination, :final_delivery_date, :handover_date,
-                :shipping_date, :delivery_address, :invoice_address, :status, :client_id,
+                :order_number, :order_date, :order_terms, :consignee, :shipment_address, :final_destination,
+                :final_delivery_date, :handover_date, :shipping_date, :delivery_address, :invoice_address, :status, :client_id,
                 items: %i[customer_item_no product_id quantity price unit_id delivery_date]
               )
       end

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

@@ -3,9 +3,17 @@ module Comee
     class SuppliersController < ApplicationController
       include Common
 
+      def index
+        super do
+          Supplier.all.then(&paginate)
+        end
+      end
+
       def filter
-        @supplier = Comee::Core::Supplier.ransack(params[:q]).result
-        render json: {success: true, data: serialize(@supplier)}
+        suppliers = Comee::Core::Supplier.ransack(params[:q]).result
+        total = suppliers.count
+        suppliers = suppliers.then(&paginate)
+        render json: {success: true, data: serialize(suppliers), page: params[:page], total: total}
       end
 
       private

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

@@ -2,6 +2,7 @@ module Comee
   module Core
     class SalesOrder < ApplicationRecord
       before_save :total_price
+      before_save :set_parent_client_name
 
       belongs_to :customer_order
       belongs_to :fulfillment_center, optional: true
@@ -29,6 +30,10 @@ module Comee
         self.total_price = total_price
       end
 
+      def set_parent_client_name
+        self.parent_client_name = client.parent&.name
+      end
+
       def self.ransackable_attributes(_auth_object = nil)
         %w[
           id

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

@@ -1,7 +1,8 @@
 module Comee
   module Core
     class ClientSerializer < ActiveModel::Serializer
-      attributes :id, :code, :name, :address, :locale, :user_id, :user_name, :parent_id, :consignees
+      attributes :id, :code, :name, :address, :locale, :user_id, :user_name, :consignees, :shipment_addresses
+      belongs_to :parent
     end
   end
 end

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

@@ -1,8 +1,9 @@
 module Comee
   module Core
     class CustomerOrderSerializer < ActiveModel::Serializer
-      attributes :id, :order_number, :order_date, :order_terms, :consignee, :final_destination, :final_delivery_date, :handover_date,
-                 :shipping_date, :delivery_address, :invoice_address, :status, :file_url
+      attributes :id, :order_number, :order_date, :order_terms, :consignee, :shipment_address, :final_destination,
+                 :final_delivery_date, :handover_date, :shipping_date, :delivery_address, :invoice_address, :status,
+                 :file_url
 
       belongs_to :client
       has_many :customer_order_items

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, :files_url, :customs_detail
+                 :handover_date, :remark, :parent_client_name, :created_by, :files_url, :customs_detail
       belongs_to :customer_order
       belongs_to :client
       belongs_to :fulfillment_center

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

@@ -112,7 +112,7 @@ module Comee
         order
       end
 
-      def accept(id)
+      def accept(id, accepted_by = nil)
         order = CustomerOrder.find_by(id: id)
         raise(StandardError, "Customer order with id `#{id}` not found.") unless order
 
@@ -136,7 +136,8 @@ module Comee
             order_number: order.order_number,
             customer_order: order,
             status: SalesOrder.statuses[:draft],
-            client: order.client
+            client: order.client,
+            created_by: accepted_by || ""
           )
           order_items = order.customer_order_items.includes(:product, :unit)
           client_id = order.client.parent_id || order.client_id

data/config/routes.rb

@@ -82,6 +82,7 @@ Comee::Core::Engine.routes.draw do
       get "rfq_products", controller: :quotation_requests, action: :rfq_products_for_client
       get "prices", controller: :client_prices, action: :fetch_for_client
       get "consignees"
+      get "shipment_addresses"
       get "shipment_items", controller: :shipment_items, action: :filter_for_client
     end
     collection do

data/db/migrate/20230728123039_create_comee_core_clients.rb

@@ -14,6 +14,7 @@ class CreateComeeCoreClients < ActiveRecord::Migration[7.0]
                    index: {name: "so_on_ccc_indx"},
                    foreign_key: {to_table: :comee_core_clients}
       t.string :consignees, array: true, default: []
+      t.string :shipment_addresses, array: true, default: []
 
       t.timestamps
     end

data/db/migrate/20230811083239_create_comee_core_customer_orders.rb

@@ -9,6 +9,7 @@ class CreateComeeCoreCustomerOrders < ActiveRecord::Migration[7.1]
                    foreign_key: {to_table: :comee_core_clients}
       t.string :order_terms
       t.string :consignee
+      t.string :shipment_address
       t.string :final_destination
       t.date :final_delivery_date
       t.date :handover_date

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 :parent_client_name
       t.string :payment_term
       t.string :delivery_term
       t.float :payment_penalty, null: false, default: 0.0
@@ -23,6 +24,7 @@ class CreateComeeCoreSalesOrders < ActiveRecord::Migration[7.0]
       t.string :pallete_note
       t.date :handover_date
       t.string :remark
+      t.string :created_by
 
       t.timestamps
     end

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.1.91".freeze
+    VERSION = "0.1.92".freeze
   end
 end

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

@@ -7,5 +7,6 @@ FactoryBot.define do
     locale { "en" }
     parent { nil }
     consignees { [] }
+    shipment_addresses { [] }
   end
 end

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

@@ -5,6 +5,7 @@ FactoryBot.define do
     client
     order_terms { Faker::Lorem.sentence }
     consignee { Faker::Name.name }
+    shipment_address { Faker::Address.full_address }
     final_destination { Faker::Address.full_address }
     final_delivery_date { Faker::Date.between(from: Date.current.advance(days: 20), to: Date.current.advance(months: 2)) }
     handover_date { final_delivery_date.advance(days: -10) }

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

@@ -12,5 +12,7 @@ FactoryBot.define do
     status { Comee::Core::SalesOrder.statuses[:draft] }
     pallete_note { Faker::Lorem.sentence }
     remark { Faker::Lorem.sentence }
+    parent_client_name { Faker::Name.name }
+    created_by { Faker::Name.name }
   end
 end

metadata

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