comee_core 0.3.55 → 0.3.57

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf0aa797a4e7b22548c47912a73de0ca9aa6d7b118b840f703d96c6cd26467df
-  data.tar.gz: 173e0daf0e4d21b78a9c4d8e251ef71be066278ddcce978fb30fbadd7de4dea2
+  metadata.gz: db45df800ae9a198cbcac3727ba23b4d1cbee4a5338b39f34dec65aa876a9efe
+  data.tar.gz: e231c164e88a14f67ce91c54bec08205fab262bd0228a9f8e9dcca432d2e18aa
 SHA512:
-  metadata.gz: '048126618a14aa1d29bfd69e48456948b772c645b5835ca81b20f89fdaa4d5401b1f2eb1d7098fff0372a5601a80b568ead0e60860e98425891b96fcc060fec8'
-  data.tar.gz: 35536ee2083b1e589b95ca88dc886bdbdef200034aefd4cea74325caa2ccd1343cbd18f05348e5fec858a84384598099c49cb42c5e9b02b513589041554cf88d
+  metadata.gz: 066d762a1f92dc454f2e608900db0636caecea075b2eb9930bea5aa1e434795db06cfa400a353d9808195c63848030efc758488ce774510de0ce75da5e5c3af1
+  data.tar.gz: 4593e0b6a48cb30c5b1df680a9315d042a7da46d4fcd5bd29b5580be967ca8acb1201ec5b98b30c4a4b6116e314cdc418a7b722854084970210da55185139f76

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

@@ -2,7 +2,7 @@ module Comee
   module Core
     class SalesOrdersController < ApplicationController
       include Common
-      before_action :set_service, only: %i[submit confirm accept cancel]
+      before_action :set_service, only: %i[submit confirm accept cancel revert]
 
       def index
         super do
@@ -131,6 +131,13 @@ module Comee
         render json: {success: false, error: e.message}
       end
 
+      def revert
+        order = @service.revert(params[:id])
+        render_content(order)
+      rescue StandardError => e
+        render json: {success: false, error: e.message}
+      end
+
       def create_back_order
         service = SalesOrderService.new
         result = service.create_back_orders(back_order_params[:payload])

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

@@ -21,6 +21,10 @@ module Comee
 
         errors.add(:default, "cannot be set to true. There is already a default address for this client and address type.")
       end
+
+      def ransackable_attributes(_auth_object = nil)
+        %w[name]
+      end
     end
   end
 end

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

@@ -25,11 +25,22 @@ module Comee
       validates :shipping_arrangement, inclusion: {in: SHIPPING_ARRANGEMENTS}, allow_nil: true
 
       def self.ransackable_attributes(_auth_object = nil)
-        %w[id client_id delivery_address invoice_address order_number status final_destination consignee]
+        %w[
+          id
+          client_id
+          delivery_address
+          invoice_address
+          order_number
+          status
+          final_destination
+          consignee
+          consolidator_date
+          shipping_date
+        ]
       end
 
       def self.ransackable_associations(_auth_object = nil)
-        %w[client customer_order_items]
+        %w[client customer_order_items shipment_address]
       end
 
       def file_url

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

@@ -68,11 +68,13 @@ module Comee
           consignee
           destination
           customer_order_id
+          consolidator_date
+          shipping_date
         ]
       end
 
       def self.ransackable_associations(_auth_object = nil)
-        %w[client customer_order]
+        %w[client customer_order shipment_address]
       end
 
       def files_url

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

@@ -202,6 +202,23 @@ module Comee
         order.update!(status: SalesOrder.statuses[:canceled])
         order
       end
+
+      def revert(id)
+        order = SalesOrder.find_by(id: id)
+        raise(StandardError, "Sales order with id `#{id}` not found.") unless order
+
+        raise(StandardError, "Sales order should be in draft state.") unless order.draft?
+
+        customer_order = order.customer_order
+
+        ActiveRecord::Base.transaction do
+          Comee::Core::SalesOrderItem.where(sales_order: order).delete_all
+          order.delete
+          customer_order.status = Comee::Core::CustomerOrder.statuses[:draft]
+          customer_order.save!
+        end
+        customer_order
+      end
     end
   end
 end

data/config/routes.rb

@@ -165,6 +165,7 @@ Comee::Core::Engine.routes.draw do
       post "confirm"
       post "accept"
       post "cancel"
+      post "revert"
       get "services", controller: :additional_services, action: :index
     end
   end

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.3.55".freeze
+    VERSION = "0.3.57".freeze
   end
 end

metadata

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