comee_core 0.1.82 → 0.1.84

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aec2eead92d024daab37e1477e49f59cf15b03710c8f2846cca144a2991bb2a1
-  data.tar.gz: 11b7949daff48bb2b49466abbede7b76c39b1e862bb332a1b5f5999308b1fcc4
+  metadata.gz: 88c220e6b121eb2fc8a4191d432f5063df0bad832d3489443798c44618421797
+  data.tar.gz: 78c951ec96109410776b2345b927772a6e069ef078b558e69f7bbef0b49fca67
 SHA512:
-  metadata.gz: 438cb2d9d91f97c3d7ab2aa099e949045dadcf67528b9eb146b356adaa9bb849776256fc5c258ef99b461252ba6765e80e2d864c31f35f631a5db70e7417c176
-  data.tar.gz: 986ce5f97c44033fc95ff38ace756d151dcaeef290be9b6d4fa0349898c6f4c851a918d74242bd71462eb04fde947def19ded389c56c570ae432aae59eb29431
+  metadata.gz: 726ab140419d49fb2b08bc68beb970cdc3f5f34ea5de70ed0f65d90a4b2930fb3a976def5dadd5837ca48e5c5a237d75dec8b5ad333c380f048302c224d588e7
+  data.tar.gz: 0a49d0031869536a37b50af5a67d86ca6e51bfc3631d3191965c90270d2dbe14949e748464ad164530543a48e353b355ed012321a6ada12dc574592301519aa5

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

@@ -3,7 +3,12 @@ module Comee
     class CustomerOrdersController < ApplicationController
       include Common
 
-      before_action :set_service, only: %i[submit submit_for_confirmation accept cancel]
+      before_action :set_service, only: %i[create_with_items submit submit_for_confirmation accept cancel]
+
+      def create_with_items
+        order = @service.create(create_with_item_params)
+        render json: {success: true, data: serialize(order)}
+      end
 
       def submit
         order = @service.submit(params[:id])
@@ -45,6 +50,11 @@ module Comee
                                         :file)
       end
 
+      def create_with_item_params
+        params.require(:payload).permit(:order_number, :order_date, :order_terms, :delivery_address, :invoice_address, :status, :client_id,
+                                        items: %i[customer_item_no product_id quantity price unit_id delivery_date])
+      end
+
       def set_service
         @service = CustomerOrderService.new
       end

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

@@ -0,0 +1,13 @@
+module Comee
+  module Core
+    class FulfillmentCentersController < ApplicationController
+      include Common
+
+      private
+
+      def model_params
+        params.require(:payload).permit(:code, :name, :address, :email, service: [])
+      end
+    end
+  end
+end

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

@@ -27,6 +27,11 @@ module Comee
         render json: {success: true, data: serialize(data)}
       end
 
+      def categories
+        root = Product.find_by(code: "root")
+        render json: {success: true, data: serialize(root.children)}
+      end
+
       def filter
         products = Product.ransack(params[:q]).result
         render json: {success: true, data: serialize(products)}

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

@@ -6,7 +6,10 @@ module Comee
 
       def index
         super do
-          Comee::Core::SalesOrder.includes(:customer_order, :fulfillment_center, :sales_order_items).all
+          [
+            Comee::Core::SalesOrder.includes(:customer_order, :fulfillment_center, :sales_order_items).all,
+            include: ["sales_order_items", "sales_order_items.product", "sales_order_items.unit"]
+          ]
         end
       end
 

data/app/controllers/concerns/comee/core/common.rb

@@ -9,16 +9,28 @@ module Comee
       end
 
       def index
-        data = if block_given?
-                 yield
-               else
-                 @clazz.all
-               end
+        data = nil
+        options = {}
+        if block_given?
+          incoming = yield
+          if incoming.instance_of?(Array)
+            data, options = incoming
+          else
+            data = incoming
+          end
+        else
+          data = @clazz.all
+        end
+        # data, options = if block_given?
+        #                   yield
+        #                 else
+        #                   [@clazz.all, {}]
+        #                 end
         page = params[:page]
         if page
-          render json: {success: true, data: serialize(data), page: page, total: @clazz.count}
+          render json: {success: true, data: serialize(data, options), page: page, total: @clazz.count}
         else
-          render json: {success: true, data: serialize(data)}
+          render json: {success: true, data: serialize(data, options)}
         end
       end
 
@@ -58,8 +70,8 @@ module Comee
 
       private
 
-      def serialize(data)
-        ActiveModelSerializers::SerializableResource.new(data)
+      def serialize(data, options = {})
+        ActiveModelSerializers::SerializableResource.new(data, options)
       end
 
       def set_clazz

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

@@ -9,6 +9,10 @@ module Comee
       def self.ransackable_attributes(_auth_object = nil)
         %w[code item_description itemable_id itemable_type product_id]
       end
+
+      def self.ransackable_associations(_auth_object = nil)
+        []
+      end
     end
   end
 end

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

@@ -8,6 +8,10 @@ module Comee
 
       validates :reference_no, presence: true, uniqueness: true
       validates :status, presence: true
+
+      def self.ransackable_attributes(_auth_object = nil)
+        %w[client_id reference_no status]
+      end
     end
   end
 end

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

@@ -0,0 +1,7 @@
+module Comee
+  module Core
+    class FulfillmentCenterSerializer < ActiveModel::Serializer
+      attributes :id, :code, :name, :address, :email, :service
+    end
+  end
+end

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

@@ -1,6 +1,19 @@
 module Comee
   module Core
     class CustomerOrderService
+      def create(params)
+        order = nil
+        params = params.with_indifferent_access
+        ActiveRecord::Base.transaction do
+          order_params = params.except(:items)
+          order = Comee::Core::CustomerOrder.create(**order_params)
+          items = params.slice(:items)[:items]
+          items.each { |item| item[:customer_order_id] = order.id }
+          Comee::Core::CustomerOrderItem.insert_all!(items)
+        end
+        order
+      end
+
       ##
       # This method converts a price value per a unit of measure to a price value per another
       # unit of measure.

data/config/routes.rb

@@ -8,12 +8,17 @@ Comee::Core::Engine.routes.draw do
       post "mark_as_unread", controller: :notifications, action: :mark_as_unread
     end
   end
-  post "/suppliers/filter", controller: :suppliers, action: :filter
-  resources :suppliers
+  resources :suppliers do
+    collection do
+      post "filter"
+    end
+  end
   resources :products do
     collection do
       post "master_prices"
       post "client_prices"
+      post "filter"
+      get "categories"
     end
   end
   resources :product_lookups do
@@ -42,7 +47,6 @@ Comee::Core::Engine.routes.draw do
     end
   end
   resources :external_rfqs
-  post "/customer_orders/filter", controller: :customer_orders, action: :filter
   resources :customer_orders do
     member do
       post "submit"
@@ -50,6 +54,10 @@ Comee::Core::Engine.routes.draw do
       post "accept"
       post "cancel"
     end
+    collection do
+      post "filter"
+      post "create_with_items"
+    end
   end
   resources :customer_order_items do
     collection do
@@ -106,7 +114,10 @@ Comee::Core::Engine.routes.draw do
     end
   end
   resources :customs_details
-  resources :item_statuses
-  post "/item_statuses/filter", controller: :item_statuses, action: :filter
-  post "/products/filter", controller: :products, action: :filter
+  resources :item_statuses do
+    collection do
+      post "filter"
+    end
+  end
+  resources :fulfillment_centers
 end

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.1.82".freeze
+    VERSION = "0.1.84".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.1.82
+  version: 0.1.84
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-06 00:00:00.000000000 Z
+date: 2024-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -288,6 +288,7 @@ files:
 - app/controllers/comee/core/customer_orders_controller.rb
 - app/controllers/comee/core/customs_details_controller.rb
 - app/controllers/comee/core/external_rfqs_controller.rb
+- app/controllers/comee/core/fulfillment_centers_controller.rb
 - app/controllers/comee/core/item_statuses_controller.rb
 - app/controllers/comee/core/lookups_controller.rb
 - app/controllers/comee/core/notifications_controller.rb
@@ -356,6 +357,7 @@ files:
 - app/serializers/comee/core/customer_order_serializer.rb
 - app/serializers/comee/core/customs_detail_serializer.rb
 - app/serializers/comee/core/external_rfq_serializer.rb
+- app/serializers/comee/core/fulfillment_center_serializer.rb
 - app/serializers/comee/core/item_status_serializer.rb
 - app/serializers/comee/core/lookup_serializer.rb
 - app/serializers/comee/core/master_price_serializer.rb