Merge branch 'main' into feat/control-clothing-manufacturing

Author: puppe1990

README.md

@@ -113,18 +113,20 @@ Você pode testar o Open Erp com um clique no Heroku:
 
 ## Contribuindo
 
-Este projeto existe graças a todas as pessoas que contribuem. Fique a vontade para contribuir! Essas aqui são boas [issues](https://github.com/puppe1990/open-erp/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22) para começar! Se tiver dúvidas ou interesse em utilizar em algum negócio entre em contato em matheus.puppe@gmail.com
+Este projeto existe graças a todas as pessoas que contribuem. Fique a vontade para contribuir! Essas aqui são boas [issues](https://github.com/Purple-Stock/open-erp/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22) para começar! Se tiver dúvidas ou interesse em utilizar em algum negócio entre em contato em matheus.puppe@gmail.com
+
 
 ## Contribuidores
 
 Esse projeto existe graças ao esforço e dedicação dessas pessoas:
 
 **Desenvolvimento**
 
-<a href="https://github.com/puppe1990/open-erp/graphs/contributors">
-  <img src="https://contrib.rocks/image?repo=puppe1990/open-erp" />
+<a href="https://github.com/Purple-Stock/open-erp/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=Purple-Stock/open-erp" />
 </a>
 
 ## Licença
 
-[MIT](https://github.com/puppe1990/open-erp/blob/master/LICENSE)
+[MIT](https://github.com/Purple-Stock/open-erp/blob/master/LICENSE)
+

app/jobs/daily_canceled_order_job.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+# DailyCanceledOrderJob perform against created orders set previously
+# with another status.
+# For this reason, we should call this job as an updater job.
+# The crucial difference here is the absence of the alteration date in the bling API response.
+# It is possible to filter by alteration date, however the alteration date (dataAlteraçãoInicial) is not
+# present in the response. Our solution is querying by alteration date assuming it is the same in bling API
+# setting this assumed value directly on our database.
+# Motives to run this job:
+# There are orders status over counted. There are possibilities they became canceled on bling API
+class DailyCanceledOrderJob < BlingOrderItemCreatorBaseJob
+  STATUS = BlingOrderItem::Status::CANCELED.freeze
+
+  attr_accessor :account_id
+
+  def perform(account_id, initial_alteration_date = nil)
+    @status = STATUS
+    @account_id = account_id
+    @initial_date = initial_alteration_date || Date.today
+    @final_date = Date.today
+    date_range = (@initial_date..@final_date)
+    date_range.each do |alteration_date|
+      @alteration_date = alteration_date
+      final_alteration_date = (alteration_date + 1.day).strftime
+      options = { dataAlteracaoInicial: @alteration_date.strftime, dataAlteracaoFinal: final_alteration_date }
+      orders = Services::Bling::Order.call(order_command: 'find_orders', tenant: account_id,
+                                           situation: STATUS, options: options)
+      orders = orders['data']
+
+      create_orders(orders)
+    end
+  end
+end

app/models/revenue_estimation.rb

@@ -17,6 +17,7 @@ class RevenueEstimation < ApplicationRecord
 
   validates :revenue, :average_ticket, :date, presence: :true
   validates :revenue, numericality: :true
+  validates :average_ticket, numericality: { greater_than: 0 }
 
   before_save :calculate_quantity
   before_validation :set_date

app/models/shein_order.rb

@@ -11,7 +11,7 @@
 # Indexes
 #
 #  index_shein_orders_on_account_id  (account_id)
-#
+
 require 'zip'
 
 class SheinOrder < ApplicationRecord

app/views/revenue_estimations/_form.html.erb

@@ -30,12 +30,12 @@
   <div class="form-row">
     <div class="form-group col-6">
       <%= f.label :month, :class => 'control-label' %>
-      <%= f.number_field :month, :class => 'form-control', value: f.object.date&.month %>
+      <%= f.select :month, options_for_select((1..12).map { |m| [I18n.t("date.month_names")[m], m] }, Time.now.month), {}, class: 'form-control' %>
     </div>
 
     <div class="form-group col-6">
       <%= f.label :revenue, :class => 'control-label' %>
-      <%= f.text_field :revenue, :class => 'form-control' %>
+      <%= f.text_field :revenue, value: number_to_currency(f.object.revenue, precision: 2), class: 'form-control' %>
     </div>
 
     <div class="form-group col-6">
@@ -45,7 +45,7 @@
 
     <div class="form-group col-6">
       <%= f.label :average_ticket, :class => 'control-label' %>
-      <%= f.text_field :average_ticket, :class => 'form-control' %>
+      <%= f.text_field :average_ticket, value: number_to_currency(f.object.average_ticket, precision: 2), class: 'form-control' %>
     </div>
 
     <div class="form-group">

config/environments/development.rb

@@ -130,7 +130,6 @@
                                         set: { priority: 1 }, # additional Active Job properties; can also be a lambda/proc e.g. `-> { { priority: [1,2].sample } }`
                                         description: "Create Order Items statuses are canceled" # optional description that appears in Dashboard
     },
-
     checked_order_items_task: {
       cron: "@weekly",
       class: "CheckedBlingOrderItemsJob",

config/environments/production.rb

@@ -156,7 +156,6 @@
                                         set: { priority: 1 }, # additional Active Job properties; can also be a lambda/proc e.g. `-> { { priority: [1,2].sample } }`
                                         description: "Create Order Items statuses are canceled" # optional description that appears in Dashboard
     },
-
     checked_order_items_task: {
       cron: "@weekly",
       class: "CheckedBlingOrderItemsJob",

config/locales/pt-BR.models.revenue_estimations.yml

@@ -18,4 +18,4 @@ pt-BR:
         updated: Estimativa da Receita Atualizada
         deleted: Estimativa da Receita Deletada
         new: Nova Estimativa da Receita
-        month: Número do Mês
+        month: Mês

config/locales/pt-BR.yml

@@ -224,6 +224,8 @@ pt-BR:
     tailor:
       edit:
         title: "Editar Costureiro"
+      new: Criar %{model}
+      edit: Editar %{model}
     actions: Ações
   number:
     currency:
@@ -295,13 +297,13 @@ pt-BR:
       long: "%d de %B de %Y, %H:%M"
       short: "%d de %B, %H:%M"
     pm: ''
-  
+    
   date:
     formats:
       default: "%d-%m-%Y"
       long: "%d de %B de %Y"
       short: "%d de %B"
-
+      
   January: Janeiro
   February: Fevereiro
   March: Março
@@ -326,3 +328,4 @@ helpers:
       add_product: "Adicionar Produto"
       consider: "Considerar"
       submit_button: "Enviar"
+

spec/factories/shein_orders.rb

@@ -11,7 +11,10 @@
 # Indexes
 #
 #  index_shein_orders_on_account_id  (account_id)
-#
+#  data       :json
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+
 FactoryBot.define do
   factory :shein_order do
     data { "" }

spec/jobs/daily_canceled_order_job_spec.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe DailyCanceledOrderJob, type: :job do
+  let(:user) { FactoryBot.create(:user) }
+  let(:date) { Date.new(2023, 11, 22) }
+  let(:alteration_date) { Date.new(2023, 12, 14) }
+  let(:situation_id) { BlingOrderItem::Status::PENDING }
+  let(:bling_order_id) { '19341921284' }
+
+  describe '#perform' do
+    before do
+      allow(Date).to receive(:today).and_return Date.new(2023, 12, 14)
+      FactoryBot.create(:bling_datum, account_id: user.account.id, expires_at: Time.zone.now + 2.days)
+      FactoryBot.create(:bling_order_item, bling_order_id:, date:, situation_id:)
+    end
+
+    it 'has status canceled' do
+      VCR.use_cassette('canceled_by_initial_alteration_date', erb: true) do
+        subject.perform(user.account.id)
+        expect(BlingOrderItem.find_by(bling_order_id:).situation_id.to_i)
+          .to eq(BlingOrderItem::Status::CANCELED)
+      end
+    end
+
+    it 'is equal to alteration_date' do
+      VCR.use_cassette('canceled_by_initial_alteration_date', erb: true) do
+        subject.perform(user.account.id)
+        expect(BlingOrderItem.find_by(bling_order_id:).alteration_date.to_date)
+          .to eq(alteration_date)
+      end
+    end
+  end
+end

spec/models/revenue_estimation_spec.rb

@@ -19,6 +19,7 @@
     it { is_expected.to validate_presence_of(:revenue) }
     it { is_expected.to validate_presence_of(:date) }
     it { is_expected.to validate_numericality_of(:revenue) }
+    it { is_expected.to validate_numericality_of(:average_ticket).is_greater_than(0) }
   end
 
   describe '#save' do

spec/models/shein_order_spec.rb

@@ -11,6 +11,9 @@
 # Indexes
 #
 #  index_shein_orders_on_account_id  (account_id)
+#  data       :json
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
 #
 require 'rails_helper'
 

spec/spec_helper.rb

@@ -12,6 +12,14 @@
     # https://github.com/vcr/vcr/discussions/887 ways to hide sensitive data.
     interaction.request.headers['Authorization'][0] = "Bearer <%= ENV['ACCESS_TOKEN'] %>"
     interaction.response.body.gsub!(/\d{3}[.]\d{3}[.]\d{3}[-]\d{2}/, '999.999.999-99')
+    # Some names with latin punctuation had escaped
+    interaction.response.body.gsub!(/\\u00ed/, '')
+    interaction.response.body.gsub!(/\\u00f3/, '')
+    interaction.response.body.gsub!(/\\u00fa/, '')
+    interaction.response.body.gsub!(/\\u00e3/, '')
+    interaction.response.body.gsub!(/\\u00e7/, '')
+    interaction.response.body.gsub!('******', 'Aa Bb')
+    interaction.response.body.gsub!('****', 'Aa Bb')
     interaction.response.body.gsub!(/"nome\":["^\"][a-z-A-Z]+[\s][a-z-A-Z | \s]+/, "\"nome\":\"Faker Name Souza")
   end
 end