From 68bf79f6f719a9a11013189292fd0fa7c5d7d912 Mon Sep 17 00:00:00 2001 From: AbulAsar Sayyad Date: Tue, 31 Mar 2020 19:08:18 +0530 Subject: [PATCH 1/2] assigning status to state on order for stockit orders --- app/controllers/api/v1/orders_controller.rb | 1 + app/models/order.rb | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/app/controllers/api/v1/orders_controller.rb b/app/controllers/api/v1/orders_controller.rb index b66689f4a..320c4b7e6 100644 --- a/app/controllers/api/v1/orders_controller.rb +++ b/app/controllers/api/v1/orders_controller.rb @@ -130,6 +130,7 @@ def order_record if order_params[:stockit_id] @order = Order.accessible_by(current_ability).where(stockit_id: order_params[:stockit_id]).first_or_initialize @order.assign_attributes(order_params) + @order.assign_state(params[:status]) @order.stockit_activity = stockit_activity @order.stockit_contact = stockit_contact @order.stockit_organisation = stockit_organisation diff --git a/app/models/order.rb b/app/models/order.rb index a6f32d924..6ec5773f3 100755 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -111,6 +111,10 @@ class Order < ActiveRecord::Base scope :goodcity_orders, -> { where(detail_type: "GoodCity") } scope :shipments, -> { where(detail_type: "Shipment") } + def assign_state(status) + state = SHIPMENT_STATUS_MAP[status] + end + def can_dispatch_item? ORDER_UNPROCESSED_STATES.include?(state) end From 686fad4ee8c11e459229fb18b491775db419a75b Mon Sep 17 00:00:00 2001 From: AbulAsar Sayyad Date: Wed, 1 Apr 2020 12:18:11 +0530 Subject: [PATCH 2/2] assign default state for sync --- app/models/order.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/order.rb b/app/models/order.rb index 6ec5773f3..36a784719 100755 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -112,7 +112,7 @@ class Order < ActiveRecord::Base scope :shipments, -> { where(detail_type: "Shipment") } def assign_state(status) - state = SHIPMENT_STATUS_MAP[status] + self.state = SHIPMENT_STATUS_MAP[status] || "processing" end def can_dispatch_item?