comee_core 0.2.97 → 0.2.99

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c8e51d4338bca0293010bb351722f44c8f2f653eb8afe8aca1b9abf152b2f98
-  data.tar.gz: b11f9d292f843c1798812e9f8fdf9447f13c34b6543f1f4c2d4d30e7bff413bb
+  metadata.gz: 6f908a911b1098420945879d34cfcea3d9d2621d45558a771fc00523f90f5c9f
+  data.tar.gz: a5a0ba0c43e01acd881f85a99ac0913ce87863ead8528dc313095874e0af435d
 SHA512:
-  metadata.gz: 04d1973d5085f0961d4c47f569eeebdb7b7aea89f1c6b65c926095b027f9da10251bd77fbef14883bf8f681a25e12de5bf1938d75f8e22c64af6999d1a47ae1c
-  data.tar.gz: b211b69a816ece7e4354e9e81f643683d9f3b491041b404838e89d2f5730ac8d3744f07edc3c70f6915ec6cb347da77e2a4e58dc0c2313d0e19e66cc6109fda2
+  metadata.gz: 2ecbb6029fd90d1238167c0d9f25e855bbe4564e444f5265c9fad5419d68cf42106bc9cebf9ed6ad1b378716bd44a8c7d2205a8c930512553b962d7d2b6227dd
+  data.tar.gz: 7a1532959dd4b0f75c9ede644ba2b5d8f2179328c7d6f4bce434a4e194e76062efe835f9c7824f1c6353b05dab7dee065df3610e82c50a8b52d6a1b11152c767

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

@@ -21,7 +21,6 @@ module Comee
         data = CustomerOrderItem.includes(:product, :unit)
                                 .ransack(params[:q])
                                 .result
-                                .order(:serial_no)
         render_content(data, {include: ["unit"]})
       end
 

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

@@ -23,7 +23,7 @@ module Comee
           :source,
           :product,
           :unit
-        ).ransack(params[:q]).result.order(:serial_no)
+        ).ransack(params[:q]).result
         render_content(data)
       end
 

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

@@ -1,6 +1,8 @@
 module Comee
   module Core
     class CustomerOrderItem < ApplicationRecord
+      default_scope { order(serial_no: :asc) }
+
       before_save :calculate_total_price
 
       belongs_to :customer_order

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

@@ -40,12 +40,13 @@ module Comee
           order_number
           status
           purchase_status
+          consignee
           customer_order_id
         ]
       end
 
       def self.ransackable_associations(_auth_object = nil)
-        ["client"]
+        %w[client customer_order]
       end
 
       def files_url

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

@@ -1,6 +1,8 @@
 module Comee
   module Core
     class SalesOrderItem < ApplicationRecord
+      default_scope { order(serial_no: :asc) }
+
       before_save :calculate_total_price
       before_save :calculate_handover_date
       after_save :update_sales_order_purchase_status, if: proc { |item| item.fully_processed? }

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

@@ -2,6 +2,14 @@ module Comee
   module Core
     class CustomerOrderService
       def create(params)
+        ActiveRecord::Base.transaction do
+          prev_order = Comee::Core::CustomerOrder.find_by(order_number: params[:order_number])
+
+          if prev_order && Comee::Core::CustomerOrderItem.exists?(customer_order_id: prev_order.id)
+            Comee::Core::CustomerOrderItem.where(customer_order_id: prev_order.id).delete_all
+            prev_order.delete
+          end
+        end
         order = nil
         params = params.to_h.with_indifferent_access
         ActiveRecord::Base.transaction do

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.2.97".freeze
+    VERSION = "0.2.99".freeze
   end
 end

metadata

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