comee_core 0.1.82 → 0.1.83

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aec2eead92d024daab37e1477e49f59cf15b03710c8f2846cca144a2991bb2a1
-  data.tar.gz: 11b7949daff48bb2b49466abbede7b76c39b1e862bb332a1b5f5999308b1fcc4
+  metadata.gz: 76f47c496c4a524edbc87938c14f4056182ec04520fdb83c3c78d13e38a279eb
+  data.tar.gz: ca6a83b2354cd9c1a8b3a7a61c72cbbd134b2c09bc86a445abd147ad1e69368f
 SHA512:
-  metadata.gz: 438cb2d9d91f97c3d7ab2aa099e949045dadcf67528b9eb146b356adaa9bb849776256fc5c258ef99b461252ba6765e80e2d864c31f35f631a5db70e7417c176
-  data.tar.gz: 986ce5f97c44033fc95ff38ace756d151dcaeef290be9b6d4fa0349898c6f4c851a918d74242bd71462eb04fde947def19ded389c56c570ae432aae59eb29431
+  metadata.gz: e2c96de79bcd9c67931f8c93b0318b48cc5677ccb1e158c3057c2d1de7d607bf7ee2db009d67cab29698ff895bf5d81d4b1a141ef86708291644b2ada7698be8
+  data.tar.gz: a77db4503767df48c75a495a5778852779901be087ef487b1c6128816a4bb8a6645599024724405bcd198fa889e40588e03b13efba6fbd32e23f72c037f1f902

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/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/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

@@ -42,7 +42,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 +49,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

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.1.82".freeze
+    VERSION = "0.1.83".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.83
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-06 00:00:00.000000000 Z
+date: 2024-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers