ecom_core 1.0.15 → 1.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2346f4c0429ae35add67d619cf42043f3e6ab6deaf6f3e839cdad2b6ca0a7f5b
-  data.tar.gz: 4c80e787d737e72bba5c92c3f7ab75df9959a5db765406438cd8e0af3f6a5424
+  metadata.gz: 788f4d113098571cc799a0c9279597378b44d653f7515118c01b2fa164afd243
+  data.tar.gz: f109fdd69d9da9cc717c35d824f831982da67c087eece901b9c2c8eccf893e07
 SHA512:
-  metadata.gz: ee58fedfa253906dffc05a15afd4b8ad153db9c9a674ccbeba7df9c0750647ff01e97453e0bb958cfad5a346c75cfc9abb482993a8bcb65efb509c5452192ac4
-  data.tar.gz: 9f4bf29fc4b9f53fbfa35985d1331a9230882de43a3c77d75b0aa468ae7244164d24d22ef1b0570c27c19e5dcf0fd256d3a85361a2e5cea6b623c1bb976e8509
+  metadata.gz: a2aeae45d21fc34414c778230e8607fe086bd794e4db3b712d1a3700ed6a71f0dc5e54b4341f8fdc77ddbc570a720625ff14827eb675108af4e60d084a0ef03f
+  data.tar.gz: 4a2221c71893ce5f70457a5c90330beadae19af3f4cbde506dda97283e8be871dd1895afd624e75a48ff05afb235863370aeb3f6f742eef740345199d008fa63

data/app/models/ecom/core/payment.rb

@@ -4,6 +4,17 @@ module Ecom
       belongs_to :payroll
       has_many :payment_details, class_name: 'Ecom::Core::PaymentDetail', dependent: :destroy
       validates :from, :to, presence: true
+
+      before_validation :set_payment_order
+
+      def set_payment_order
+        unless payroll
+          self.payment_order = 1
+          return
+        end
+        previous_payment = payroll.payments.find_by(approved: true)
+        self.payment_order = previous_payment ? previous_payment.payment_order + 1 : 1
+      end
     end
   end
 end

data/db/migrate/20200207035823_add_additional_columns_to_payment.rb

@@ -0,0 +1,6 @@
+class AddAdditionalColumnsToPayment < ActiveRecord::Migration[6.0]
+  def change
+    add_column :ecom_core_payments, :approved, :boolean, null: false, default: false
+    add_column :ecom_core_payments, :payment_order, :integer, null: false, default: 1
+  end
+end

data/lib/ecom/core/version.rb

@@ -1,5 +1,5 @@
 module Ecom
   module Core
-    VERSION = '1.0.15'.freeze
+    VERSION = '1.0.16'.freeze
   end
 end

data/spec/factories/ecom/core/payments.rb

@@ -3,6 +3,7 @@ FactoryBot.define do
     from { Date.parse('2000-01-01') }
     to { Date.parse('2000-01-15') }
     approved { false }
+    payment_order { 1 }
     association :payroll
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ecom_core
 version: !ruby/object:Gem::Version
-  version: 1.0.15
+  version: 1.0.16
 platform: ruby
 authors:
 - Henock L.
@@ -252,7 +252,7 @@ files:
 - db/migrate/20200126081005_create_ecom_core_payrolls.rb
 - db/migrate/20200126082103_create_ecom_core_payments.rb
 - db/migrate/20200126183218_create_ecom_core_payment_details.rb
-- db/migrate/20200207035823_add_approved_column_to_payment.rb
+- db/migrate/20200207035823_add_additional_columns_to_payment.rb
 - db/migrate/20200207040844_add_net_pay_column_to_payment_details.rb
 - lib/ecom/core.rb
 - lib/ecom/core/engine.rb

data/db/migrate/20200207035823_add_approved_column_to_payment.rb

@@ -1,5 +0,0 @@
-class AddApprovedColumnToPayment < ActiveRecord::Migration[6.0]
-  def change
-    add_column :ecom_core_payments, :approved, :boolean, null: false, default: false
-  end
-end