ecom_core 1.0.14 → 1.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4bd257f6678b4a6d2d47ef80cd2748716388301e49b71af403d2822171486e12
-  data.tar.gz: 2a59d7ff332a8cad20eb48dab49ed92f7209f7211bd0fc2b0ce26fa565fe42b2
+  metadata.gz: 2346f4c0429ae35add67d619cf42043f3e6ab6deaf6f3e839cdad2b6ca0a7f5b
+  data.tar.gz: 4c80e787d737e72bba5c92c3f7ab75df9959a5db765406438cd8e0af3f6a5424
 SHA512:
-  metadata.gz: b13fc4b2805f9d1b6459606bc672d2277ec41c8dc111269b29a89847383e845ecd7b22d265a7da697b7401c01d309898e655dd4fde2cab01b249fea6b9a4f61c
-  data.tar.gz: bb82c30965b9e6d2b81acc10c86c1171082fee2e3d8fdae3a9894caf4c180c4477edf5bdf53dfc0ff678ebecc615092f9548b87119b3e09e32531a3cf388889d
+  metadata.gz: ee58fedfa253906dffc05a15afd4b8ad153db9c9a674ccbeba7df9c0750647ff01e97453e0bb958cfad5a346c75cfc9abb482993a8bcb65efb509c5452192ac4
+  data.tar.gz: 9f4bf29fc4b9f53fbfa35985d1331a9230882de43a3c77d75b0aa468ae7244164d24d22ef1b0570c27c19e5dcf0fd256d3a85361a2e5cea6b623c1bb976e8509

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

@@ -1,7 +1,9 @@
-module Ecom::Core
-  class Payment < ApplicationRecord
-    belongs_to :payroll
-    has_many :payment_details, class_name: 'Ecom::Core::PaymentDetail'
-    validates :from, :to, presence: true
+module Ecom
+  module Core
+    class Payment < ApplicationRecord
+      belongs_to :payroll
+      has_many :payment_details, class_name: 'Ecom::Core::PaymentDetail', dependent: :destroy
+      validates :from, :to, presence: true
+    end
   end
-end
+end

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

@@ -4,7 +4,8 @@ module Ecom
       belongs_to :crew
       belongs_to :payment
 
-      validates :hours, :ot_hours, :base_salary, :overtime, :gross_salary, :tax, :pension, :net_salary, presence: true
+      validates :hours, :ot_hours, :base_salary, :overtime, :gross_salary, :tax, :pension, :net_salary, :net_pay,
+                presence: true
     end
   end
 end

data/db/migrate/20200207035823_add_approved_column_to_payment.rb

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

data/db/migrate/20200207040844_add_net_pay_column_to_payment_details.rb

@@ -0,0 +1,5 @@
+class AddNetPayColumnToPaymentDetails < ActiveRecord::Migration[6.0]
+  def change
+    add_column :ecom_core_payment_details, :net_pay, :float, null: false, default: 0
+  end
+end

data/lib/ecom/core/version.rb

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

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

@@ -4,10 +4,11 @@ FactoryBot.define do
     ot_hours { 1.5 }
     base_salary { 1.5 }
     overtime { 1.5 }
-    gross_salary { 1.5 }
-    tax { 1.5 }
-    pension { 1.5 }
-    net_salary { 1.5 }
+    gross_salary { 100 }
+    tax { 15 }
+    pension { 5 }
+    net_salary { 80 }
+    net_pay { 80 }
     association :crew
     association :payment
   end

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

@@ -2,6 +2,7 @@ FactoryBot.define do
   factory :payment, class: 'Ecom::Core::Payment' do
     from { Date.parse('2000-01-01') }
     to { Date.parse('2000-01-15') }
+    approved { false }
     association :payroll
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecom_core
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.0.15
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-04 00:00:00.000000000 Z
+date: 2020-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -252,6 +252,8 @@ 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/20200207040844_add_net_pay_column_to_payment_details.rb
 - lib/ecom/core.rb
 - lib/ecom/core/engine.rb
 - lib/ecom/core/version.rb