cats_core 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1410fa75e3f9e4eb96e4c9df8cbd6bb358bb56e4cce6ef42b095aff3b6331b1
-  data.tar.gz: c1529759ffa5ba650bd31df10ae302943afc14e876fff0710a35144cf0841981
+  metadata.gz: ae62c0b230969901c7405d3bdf56b72dc099e77e4e6d9a21ba89243f91a1bd07
+  data.tar.gz: cc0d85257ffb25fc70a890011b1ae670dd18a0ea6938f79e73ec87a757787cd1
 SHA512:
-  metadata.gz: 9b31f50e3f08e9a65c1da38520f3afef988613654e5250607e48761274951d3be4975e6b47c704c65ad6211d03081ab1c60b3f6ae1eea6fae191d498bd021110
-  data.tar.gz: 4046501c4c360769d9bc23628f4e067b8c7b55d95f898d57fda4f202f75ddc73fa5d5a60e5f163cf37ab340024b12a28065bb80f8be9eb5f5fb64d81151e8863
+  metadata.gz: 582d0f4d63492a2ce3b3e12a7d6e84088c5c5badab3135cb108fc8876348f3e593f70d0498d6c23e79de143efb04436fd858325c6bac8a5bf29785d3a1d4d899
+  data.tar.gz: 581e221e3dff760e51095cc7094736b0a2c7f7c261d4693c8f811f3b9e2aac1ee5093ba6823895bb910488947f8616cee32b799178b5d1da64905ca40cc7b20c

data/app/controllers/cats/core/dispatches_controller.rb

@@ -52,7 +52,7 @@ module Cats
       end
 
       def search
-        data = @service.search(current_user)
+        data = @service.search(current_user, params[:status])
         render json: { success: true, data: serialize(data) }
       end
 

data/app/models/cats/core/receipt.rb

@@ -4,7 +4,9 @@ module Cats
       # Receipt status
       DRAFT = 'Draft'.freeze
       CONFIRMED = 'Confirmed'.freeze
-      RECEIPT_STATUSES = [DRAFT, CONFIRMED].freeze
+      STACKING = 'Stacking'.freeze
+      STACKED = 'Stacked'.freeze
+      RECEIPT_STATUSES = [DRAFT, CONFIRMED, STACKING, STACKED].freeze
 
       belongs_to :dispatch
       belongs_to :prepared_by, class_name: 'Cats::Core::User'

data/app/services/cats/core/dispatch_service.rb

@@ -40,7 +40,7 @@ module Cats
         dispatch
       end
 
-      def search(user)
+      def search(user, status)
         details = user.details
 
         unless details['stores'] || details['warehouse'] || details['hub']
@@ -54,12 +54,12 @@ module Cats
           dispatches = Cats::Core::Dispatch.joins(:allocation_item)
                                            .where(
                                              allocation_item: { destination: hub },
-                                             dispatch_status: Cats::Core::Dispatch::STARTED
+                                             dispatch_status: status
                                            ).or(
                                              Cats::Core::Dispatch.joins(:allocation_item)
                                                                  .where(
                                                                    allocation_item: { destination: warehouse },
-                                                                   dispatch_status: Cats::Core::Dispatch::STARTED
+                                                                   dispatch_status: status
                                                                  )
                                            )
         elsif details['warehouse']
@@ -68,12 +68,12 @@ module Cats
           dispatches = Cats::Core::Dispatch.joins(:allocation_item)
                                            .where(
                                              allocation_item: { destination: hub },
-                                             dispatch_status: Cats::Core::Dispatch::STARTED
+                                             dispatch_status: status
                                            ).or(
                                              Cats::Core::Dispatch.joins(:allocation_item)
                                                                  .where(
                                                                    allocation_item: { destination: warehouse },
-                                                                   dispatch_status: Cats::Core::Dispatch::STARTED
+                                                                   dispatch_status: status
                                                                  )
                                            )
         elsif details['hub']
@@ -81,7 +81,7 @@ module Cats
           dispatches = Cats::Core::Dispatch.joins(:allocation_item)
                                            .where(
                                              allocation_item: { destination: hub },
-                                             dispatch_status: Cats::Core::Dispatch::STARTED
+                                             dispatch_status: status
                                            )
         end
         dispatches

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.1.1'.freeze
+    VERSION = '1.1.2'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Henock L.