comee_core 0.2.12 → 0.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 854004edc559daff1dd6605fc7b95b1f83602629d2e59771a487226c95833350
-  data.tar.gz: 48fe39dcd8d5867fb4abff691bd615f1eb434b7e01cc31771bb0a1a57765af09
+  metadata.gz: dac759817de32ff973fe059159a63dd455821779c29124d8cc40763ee85e37f1
+  data.tar.gz: b848191c7faf98be197912ef1709617441aa229e501d09051d2cf05a3255e9a9
 SHA512:
-  metadata.gz: d47550e712d840c8b1d62fd3b0a7b5a34b5bd8aaf71e6fbbc48cede293d9192d0a2d6801f9176c5d09d5d42b688c28cbb7b468ea035253131f4bb049d55ffb03
-  data.tar.gz: 743df5145f4670590dbeeb08c36d32a9fea41a465ae05e8594230c554e76abb9e540122c57455a1744a8f7fd575b08ee93802c695f336188cba9dc1b773d9daf
+  metadata.gz: 51f9017b7fe3286c0d6968f6e46c970d7dc4dbcb613ab74abdc14cbd1e4dadd97888a45facfdbb9e9bcdebc5c1c0cb981faf80cb0070a253ba848910582bfb07
+  data.tar.gz: b98b538ddb7c0ca35870d1bf03557f035aacc15315cd17ec6814e3082d4f2c37055ebef011286dc66821b1d58e461262bcd7cc630d677d32318ee772ebac54bd

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

@@ -8,7 +8,16 @@ module Comee
       def index
         super do
           [
-            CustomerOrder.includes(:client, :customer_order_items).all,
+            CustomerOrder.includes(:client, customer_order_items: :unit).order(:created_at),
+            fields: ["client", "customer_order_items.unit"]
+          ]
+        end
+      end
+
+      def show
+        super do
+          [
+            CustomerOrder.includes(:client, customer_order_items: :unit).find(params[:id]),
             fields: ["client", "customer_order_items.unit"]
           ]
         end

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

@@ -16,10 +16,16 @@ module Comee
 
       def suggest_values
         service = CustomerOrderService.new
-        result = service.suggest_values(params[:id], params[:unit_id])
+        result = service.suggest_values(params[:id], suggest_params[:quantity], suggest_params[:unit_id])
         render json: {success: true, data: result}
       end
 
+      def cancel
+        item = set_object
+        item.update(canceled: true)
+        render_content(item)
+      end
+
       def destroy
         Comee::Core::SalesOrderItem.destroy(params[:id])
         render json: {success: true}
@@ -27,6 +33,10 @@ module Comee
 
       private
 
+      def suggest_params
+        params.require(:payload).permit(:unit_id, :quantity)
+      end
+
       def model_params
         params.require(:payload).permit(:sales_order_id, :customer_order_item_id, :product_id, :unit_id, :quantity, :quantity_delivered,
                                         :customer_item_no, :customer_item_description, :price, :handover_date, :delivery_date,

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

@@ -60,7 +60,7 @@ module Comee
       def model_params
         params.require(:payload).permit(:order_number, :order_date, :customer_order_id, :fulfillment_center_id, :client_id,
                                         :order_terms, :shipment_address, :delivery_address, :invoice_address, :destination,
-                                        :handover_date, :shipping_date, :delivery_date, :consignee, :payment_term, :deivery_term,
+                                        :handover_date, :shipping_date, :delivery_date, :consignee, :payment_term, :delivery_term,
                                         :payment_penalty, :status, :total_price, :amount_paid, :pallete_note, :remark,
                                         files: [])
       end

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

@@ -1,7 +1,7 @@
 module Comee
   module Core
     class CustomerOrderItem < ApplicationRecord
-      before_save :calculate_total_price, unless: proc { |item| item.total_price }
+      before_save :calculate_total_price
 
       belongs_to :customer_order
       belongs_to :product

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

@@ -2,7 +2,7 @@ module Comee
   module Core
     class SalesOrderItemSerializer < ActiveModel::Serializer
       attributes :id, :customer_item_no, :customer_item_description, :quantity, :quantity_delivered, :price, :handover_date,
-                 :delivery_date, :eb_number, :lead_time, :comment, :action_note, :po_reference, :total_price
+                 :delivery_date, :eb_number, :lead_time, :comment, :action_note, :po_reference, :total_price, :canceled
 
       belongs_to :sales_order
       belongs_to :customer_order_item

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

@@ -71,12 +71,14 @@ module Comee
         (quantity / conversion.factor).round
       end
 
-      def suggest_values(item_id, new_unit_id)
+      def suggest_values(item_id, new_quantity, new_unit_id)
         item = CustomerOrderItem.includes(:customer_order).find_by(id: item_id)
         raise(StandardError, "Order item with id `#{item_id}` not found.") unless item
 
-        quantity = convert_quantity(item.quantity, item.unit_id, new_unit_id)
-        client_price = ClientPrice.find_by(product_id: item.product_id, client_id: item.customer_order.client_id)
+        quantity = convert_quantity(new_quantity, item.unit_id, new_unit_id)
+        client = Client.find(item.customer_order.client_id)
+        client_id = client.parent_id || client.id
+        client_price = ClientPrice.find_by(product_id: item.product_id, client_id: client_id)
         if client_price
           price = convert_price(client_price.price, client_price.unit_id, new_unit_id)
         else

data/config/routes.rb

@@ -112,7 +112,8 @@ Comee::Core::Engine.routes.draw do
   end
   resources :sales_order_items, except: [:index] do
     member do
-      get "suggest", controller: :sales_order_items, action: :suggest_values
+      post "suggest", controller: :sales_order_items, action: :suggest_values
+      post "cancel"
     end
   end
   resources :shipment_items do

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.2.12".freeze
+    VERSION = "0.2.14".freeze
   end
 end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.2.14
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-06 00:00:00.000000000 Z
+date: 2024-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers