cats_core 1.5.16 → 1.5.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 279f9103030fd0c0a858e6d2d5c2f71b69644f17b3654b7e8cd6226deeefabb3
-  data.tar.gz: 58431c85a8824cd879b58f550fa28969b1f45bd9ba04cb16ab69553a6e01c3d3
+  metadata.gz: 289a8b8aee41d9ad997ac46f363357ebb9961d983aaac22cd234133fb40a4e7e
+  data.tar.gz: c2f3f4c71adbf4d2ffd07fd427d25afda5814459ca6217085882f5b2056049b1
 SHA512:
-  metadata.gz: e3f8d565b6b939cadff349df0add73ba2e50ae4eef45629d412748754e307aaf7952b69bf3138232c549c560766f23e8dcfbceb5b14ae3f7b3ddccb9c428ab92
-  data.tar.gz: e3d1c7576b48388d6f8144401218b47fd2d40b0320f1ffbe6f9ef674e70d2ab295aed46fb2ac6d9571ca0c99d611f529dc047d3e073bde557d9e02a9c726fb77
+  metadata.gz: a48354b502b466fefb8b346eb4cad0453630dac9803afd10737b33e475b7d532c213f8425a29e91658c8b2aacf4a46bb2568eec41d67ff0e4586d10700dfdfac
+  data.tar.gz: f7b6788c688d1f6e95a1c182a083a24f6738db33d40ec11dfdc1899c3fe2c8b30b1f413ae489faeb61846974c3f2b5ffe4c74050ca52af20dbb68a1925d3ac18

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

@@ -9,6 +9,16 @@ module Cats
         end
       end
 
+      def create
+        authorization = DispatchAuthorization.new(model_params)
+        if authorization.save
+          AuthorizationService.new.send_dispatch_notification(authorization)
+          render json: { success: true, data: serialize(authorization) }, status: :created
+        else
+          render json: { success: false, error: authorization.errors.full_messages[0] }, status: :unprocessable_entity
+        end
+      end
+
       def confirm
         authorization = DispatchAuthorization.find(params[:id])
         authorization = authorization.confirm

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

@@ -14,7 +14,7 @@ module Cats
       def create
         authorization = ReceiptAuthorization.new(model_params)
         if authorization.save
-          AuthorizationService.new.send_notification(authorization)
+          AuthorizationService.new.send_receipt_notification(authorization)
           render json: { success: true, data: serialize(authorization) }, status: :created
         else
           render json: { success: false, error: authorization.errors.full_messages[0] }, status: :unprocessable_entity

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

@@ -45,7 +45,7 @@ module Cats
       end
 
       def in_progress
-        raise(StandardError, 'Plan is not approved.') unless status == APPROVED
+        raise(StandardError, 'Plan is not approved.') unless status == APPROVED || status == IN_PROGRESS
 
         self.status = IN_PROGRESS
         save!

data/app/notifications/cats/core/dispatch_authorization_notification.rb

@@ -0,0 +1,31 @@
+module Cats
+  module Core
+    class DispatchAuthorizationNotification < Noticed::Base
+      deliver_by :database
+
+      param :dispatch_authorization
+
+      def message
+        authorization = params[:dispatch_authorization]
+        dispatch = authorization.dispatch
+        commodity = dispatch.dispatch_plan_item.commodity
+        title = "Dispatch Authorization Notification - #{commodity.name}"
+        date = Date.today
+
+        body = <<~BODY
+          Commodity with the following details is ordered to be dispatched from your store:
+              Authorization no. = #{dispatch.dispatch_plan_item.reference_no}
+              Dispatch Ref. = #{dispatch.reference_no}
+              Batch No. = #{commodity.batch_no}
+              Commodity = #{commodity.name}
+              Quantity = #{authorization.quantity}
+              Unit = #{authorization.unit.abbreviation}
+              Truck Plate No. = #{dispatch.plate_no}
+              Driver Name = #{dispatch.driver_name}
+              Driver Phone = #{dispatch.driver_phone}
+        BODY
+        { title: title, date: date, body: body }
+      end
+    end
+  end
+end

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

@@ -96,7 +96,7 @@ module Cats
         }
       end
 
-      def send_notification(authorization)
+      def send_receipt_notification(authorization)
         notification_rule = NotificationRule.find_by(code: 'receipt_authorization')
         error = 'Notification rule not found for receipt authorization notification.'
         raise(StandardError, error) unless notification_rule
@@ -112,6 +112,23 @@ module Cats
         notification = ReceiptAuthorizationNotification.with(receipt_authorization: authorization)
         notification.deliver(recipients)
       end
+
+      def send_dispatch_notification(authorization)
+        notification_rule = NotificationRule.find_by(code: 'dispatch_authorization')
+        error = 'Notification rule not found for dispatch authorization notification.'
+        raise(StandardError, error) unless notification_rule
+
+        users = User.joins(:roles).where(cats_core_roles: { name: notification_rule.roles })
+        recipients = users.map do |user|
+          details = user.details
+
+          user if details.key?('stores') && details['stores'].include?(authorization.store_id)
+        end.compact
+        return if recipients.empty?
+
+        notification = DispatchAuthorizationNotification.with(dispatch_authorization: authorization)
+        notification.deliver(recipients)
+      end
     end
   end
 end

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.5.16'.freeze
+    VERSION = '1.5.17'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.5.16
+  version: 1.5.17
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-04 00:00:00.000000000 Z
+date: 2023-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -358,6 +358,7 @@ files:
 - app/models/cats/core/user.rb
 - app/models/concerns/cats/core/dispatchable.rb
 - app/notifications/cats/core/allocation_notification.rb
+- app/notifications/cats/core/dispatch_authorization_notification.rb
 - app/notifications/cats/core/dispatch_notification.rb
 - app/notifications/cats/core/receipt_authorization_notification.rb
 - app/notifications/cats/core/round_plan_notification.rb