ecom_core 1.2.21 → 1.2.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76cfd20fab207f93e180437a06181c5a72c682b358918d9187d37a7e63639eb4
-  data.tar.gz: 1013344fd51d5226101fa61b7517c3e69eb05d9e05b38f6984b6cf29684810a4
+  metadata.gz: cc33c4120563276cee995e753b7c6e9bdcff0740e9b2e306549abfca286fa8b0
+  data.tar.gz: 3cf51d8bf2777ff6a56b4659b404513d85c1aa9289069284ae17f8339c3f0df8
 SHA512:
-  metadata.gz: bfb8306c686dcfdae803be799e979d072de88abec6a81dda73e2db6916e444826947b7b7d7bf9868bccc950698b8a8d5b29eab2dfe30876ca7036b71250cb10b
-  data.tar.gz: 889d5da78b1bc946007b65fd923272106f79d9839f94673a78967d5a9815bc5becec7288ad56c9306504a67808f3f3ca74d99d78afedf801e439901dd89dd88a
+  metadata.gz: 6380cdb381fe5dd76533f94351ee2fddb3be0ef6559c39d883f2e41999c50dd7fd045a9f9b58854e58433c3f5a67924c3f9fed4c24977f5fc1d880be7bf1bb43
+  data.tar.gz: ce5cb1bac51e23a63dbc85b77129b1281d847323fae967f5fa9178544f91efeb679047748da472d1139e4396dc2e7d77a1699acc6fd88912dadd97066c98e125

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

@@ -1,6 +1,7 @@
 module Ecom
   module Core
     class Crew < ApplicationRecord
+      mount_base64_uploader :photo, PhotoUploader
       PERMANENT = 'Permanent'.freeze
       SUPERVISOR = 'Supervisor'.freeze
       TEMPORARY = 'Temporary'.freeze

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

@@ -11,13 +11,13 @@ module Ecom
       scope :by_year, ->(year) { where(year: year) }
 
       def create_next
-        m = payroll.month + 1
-        y = payroll.year
+        m = month + 1
+        y = year
         if m > 12
           m = 1
           y += 1
         end
-        Payroll.create(month: m, year: y)
+        Payroll.create(month: m, year: y, project_id: project_id)
       end
     end
   end

data/app/uploaders/ecom/core/photo_uploader.rb

@@ -0,0 +1,19 @@
+module Ecom
+  module Core
+    class PhotoUploader < CarrierWave::Uploader::Base
+      storage :file
+
+      def store_dir
+        "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
+      end
+
+      def extension_whitelist
+        %w[jpg jpeg gif png]
+      end
+
+      def filename
+        original_filename
+      end
+    end
+  end
+end

data/db/migrate/20191225100054_create_ecom_core_crews.rb

@@ -12,6 +12,7 @@ class CreateEcomCoreCrews < ActiveRecord::Migration[6.0]
       t.string :wage_in_words, null: false
       t.date :employment_date
       t.boolean :sub_contracted, null: false, default: false
+      t.string :photo
       t.string :guarantor_name
       t.string :guarantor_phone
       t.boolean :active, null: false, default: true

data/lib/ecom/core/version.rb

@@ -1,5 +1,5 @@
 module Ecom
   module Core
-    VERSION = '1.2.21'.freeze
+    VERSION = '1.2.26'.freeze
   end
 end

data/lib/ecom_core.rb

@@ -3,3 +3,5 @@ require 'ecom/core/engine'
 require 'ancestry'
 require 'aasm'
 require 'active_model_serializers'
+require 'carrierwave'
+require 'carrierwave/base64'

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

@@ -10,6 +10,7 @@ FactoryBot.define do
     wage_in_words { FFaker::Name.name }
     employment_date { Date.today - 1 }
     sub_contracted { false }
+    photo { FFaker::Name.name }
     guarantor_name { FFaker::Name.name }
     guarantor_phone { FFaker::Name.name }
     active { true }

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

@@ -1,6 +1,10 @@
 FactoryBot.define do
   factory :currency, class: Ecom::Core::Currency do
-    code { FFaker::Currency.code }
-    name { FFaker::Currency.name }
+    sequence :code do |n|
+      "CCode#{n}"
+    end
+    sequence :name do |n|
+      "CName#{n}"
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecom_core
 version: !ruby/object:Gem::Version
-  version: 1.2.21
+  version: 1.2.26
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-28 00:00:00.000000000 Z
+date: 2020-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -38,6 +38,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.0
+- !ruby/object:Gem::Dependency
+  name: after_commit_everywhere
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.5
 - !ruby/object:Gem::Dependency
   name: ancestry
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +86,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: carrierwave
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: carrierwave-base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
@@ -258,6 +306,7 @@ files:
 - app/serializers/ecom/core/user_serializer.rb
 - app/services/ecom/core/menu_service.rb
 - app/services/ecom/core/token_auth_service.rb
+- app/uploaders/ecom/core/photo_uploader.rb
 - app/validators/ecom/core/date_range_validator.rb
 - config/database.ci.yml
 - config/routes.rb