raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-13 04:00:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,842 Commits 16 Branches 456 Tags
52a36f33bc28684eebcbed76277884939631a653
Commit Graph

30842 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt-Yorkley
13a7c19a06 Extract checkout step(s) validation to a service 2023-08-04 08:43:15 +10:00
Matt-Yorkley
82b8bb74a1 Remove #before_save_hook method and clarify it's intention 2023-08-04 08:43:15 +10:00
Matt-Yorkley
f3899ee251 Extract some related methods to CheckoutSteps concern 2023-08-04 08:43:15 +10:00
Matt-Yorkley
d1bcdde49f Simplify split checkout errors 2023-08-04 08:43:15 +10:00
Filipe
69dfd53658 Merge pull request #11254 from rioug/11130-add-product-filter-order-report 
11130 add product filter order report
 2023-08-03 16:08:44 +01:00
Filipe
5c67d522b8 Merge pull request #11209 from openfoodfoundation/dependabot/npm_and_yarn/stimulus_reflex-3.5.0-rc3 
chore(deps): bump stimulus_reflex from 3.5.0-rc2 to 3.5.0-rc3 + cable_ready from 5.0.0.rc2 to 5.0.1
 2023-08-03 16:01:40 +01:00
Mohamed ABDELLANI
6c53f3b8b0 move pretty_date helper into invoice presenter 2023-08-03 15:12:02 +01:00
Mohamed ABDELLANI
c21ffd338b fix only date is expected on the invoices list table. 
time is not supposed to be rendered on the invoices list table (only date)
 2023-08-03 15:12:02 +01:00
Mohamed ABDELLANI
5358802ab5 replace Presenter#invoice_date with a delagator 2023-08-03 15:11:58 +01:00
Mohamed ABDELLANI
9a3aef525a add distributor's phone number to list of attributes to serialize 2023-08-03 15:06:04 +01:00
Mohamed ABDELLANI
d044959cec fix date formatting 
implement a new helper `pretty_date`
 2023-08-03 14:55:26 +01:00
Mohamed ABDELLANI
1a8c0f18b7 order invoices by "created_at desc" on the default scope 2023-08-03 14:55:26 +01:00
Mohamed ABDELLANI
8fecc9db4b render date without time on invoices list 
+ sort invoices in the reverse order of the creation time
 2023-08-03 14:55:26 +01:00
Mohamed ABDELLANI
24b1918df5 implment blank? on Address presenter 
To keep the same method calls that are used on the legacy invoice template. I needed to redefine blank? on the address presenter.
 2023-08-03 14:53:40 +01:00
Mohamed ABDELLANI
4449484402 replace double with instance_double 2023-08-03 14:53:40 +01:00
Mohamed ABDELLANI
2fb112aecd import BulkInvoiceJob#perform spec 
1. remove the mocks
2. test the content of the generated pdf
3. remove the test of private methods
 2023-08-03 14:53:40 +01:00
Mohamed ABDELLANI
c89c8a69bc optimize OrderMailer#invoice_email spec 
Check if the email was sent without raising an error
Check if the email has an attached pdf
 2023-08-03 14:52:45 +01:00
Mohamed ABDELLANI
9b80676d7d update the logic to send invoice 
When the invoices feature is enabled, for every order, we check if
1. a new invoice must be generated
2. or, the latest invoice needs to be updated

the invoice rendrer input depends on the invoices flag.
if the feature is enabled, the input is supposed to be an invoice presenter
 2023-08-03 14:52:45 +01:00
Mohamed ABDELLANI
7daa4d3a63 simplify filtering condition to select only invoiceable orders on OrdersReflex 2023-08-03 14:52:45 +01:00
Mohamed ABDELLANI
5ae2545918 Update app/jobs/bulk_invoice_job.rb 
Co-authored-by: David Cook <david@redcliffs.net>
 2023-08-03 14:52:45 +01:00
Mohamed ABDELLANI
687760046b update the bulk invoice job to print invoiceable orders 
the invoices feature is enabled:
1. we filter non-invoiceable order
2. for each invoiceable order, we check if we need to generate a new invoice or update the latest invoice
 2023-08-03 14:52:45 +01:00
Mohamed ABDELLANI
c921250d68 implement Spree::Order#invoiceable? 
This will be used to filter the orders when running bulk print
 2023-08-03 14:52:45 +01:00
Mohamed ABDELLANI
4f6ab69add implement OrderInvoiceGenerator service 2023-08-03 14:52:45 +01:00
Mohamed ABDELLANI
f24af3feb0 extract invoice printing logic into a seperated method 2023-08-03 14:52:45 +01:00
bouaik
0c849f08fd fix tests 2023-08-03 13:04:16 +01:00
bouaik
2c08602664 fix display invoice tab 2023-08-03 11:25:31 +01:00
Filipe
46cb1add63 Merge pull request #11126 from abdellani/show-invoice-number-on-invoices 
Show invoice number on invoices
 2023-08-03 10:48:34 +01:00
Filipe
c0a4bccb3e Merge pull request #11156 from Matt-Yorkley/product-tax-category 
[Product Refactor] Tax category
 2023-08-03 10:29:40 +01:00
dependabot[bot]
106938ddbf chore(deps): bump js-big-decimal from 1.4.1 to 2.0.1 
Bumps [js-big-decimal](https://github.com/royNiladri/js-big-decimal) from 1.4.1 to 2.0.1.
- [Release notes](https://github.com/royNiladri/js-big-decimal/releases)
- [Commits](https://github.com/royNiladri/js-big-decimal/compare/v1.4.1...v2.0.1)

---
updated-dependencies:
- dependency-name: js-big-decimal
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-08-03 09:19:52 +00:00
Maikel Linke
f96636072e Use original DFC Connector.export implementation 
We wanted to use our own context before but now I found a better way for
the connector to cache the context and therfore we can use the original
implementation again.
 2023-08-03 16:45:31 +10:00
Maikel Linke
1daed8c29c Always load our DFC Connector patches 
We want to use the preloaded context when exporting documents as well.
 2023-08-03 16:45:30 +10:00
Maikel Linke
ff359664a9 Use cached DFC context 2023-08-03 16:45:30 +10:00
Neal Chambers
f5f9b80de7 Update .rubocop_todo.yml 2023-08-03 09:49:51 +09:00
Neal Chambers
a4f270bdec Fix Layout/LineLength 2023-08-03 09:49:47 +09:00
David Cook
32cc776725 Merge pull request #11177 from cyrillefr/Registration_of_an_enterprise_name_already_taken_stops_registration_process 
Registration of an enterprise name already taken stops registration process
 2023-08-03 10:37:47 +10:00
Maikel Linke
c8511ecd0d Remove superfluous line 
The `<<` operation saves the association already.
 2023-08-03 10:26:59 +10:00
Maikel Linke
6056c59301 Skip online domain validation of dev user email 
We improved the email address validation to check the domain for
existing DNS entries. But our default user has the example.com domain
which is not resolved by my internet service provider.

I couldn't find a better way to deactivate this one check than
overriding the method in the validator. The code does not affect other
parts of the app unless you run multiple rake tasks in the same command
line with the database setup.
 2023-08-03 10:22:00 +10:00
Maikel
76b7a9ea14 Merge pull request #11307 from openfoodfoundation/dependabot/npm_and_yarn/floating-ui/dom-1.5.1 
chore(deps): bump @floating-ui/dom from 1.4.5 to 1.5.1
 2023-08-03 10:04:31 +10:00
David Cook
293e135a45 Move variables to one variables file 
Note that color-tbl-border is not needed in the new admin_v3 styles.
 2023-08-03 09:49:29 +10:00
David Cook
0aa4c144b9 Rename disabled button variable 
TIL that underscores and dashes are treated the same in SCSS variables.
 2023-08-03 09:49:29 +10:00
David Cook
1a02e108a5 Use red colour from the palette 
It's very similar.
 2023-08-03 09:49:29 +10:00
David Cook
9610281ed3 Rename variables 2023-08-03 09:49:29 +10:00
David Cook
b46e6c462d Rename table border variable 
There are other vars named brd, but I think border is clearer and doesn't need to be abreviated here.
 2023-08-03 09:49:29 +10:00
David Cook
c4a335548a Rename warning color variable 
To match the others in the variables file.

Also `warning-orange` was unused.
 2023-08-03 09:49:29 +10:00
David Cook
01a9095121 Move some variables to the palette 2023-08-03 09:49:29 +10:00
David Cook
2f801d346d Prettify some more css files 2023-08-03 09:49:29 +10:00
David Cook
14e07e38d3 Remove depdenency on darkswarm/mixins 2023-08-03 09:49:29 +10:00
David Cook
bf9cd09462 Remove dependence on darkswarm variables 
There were all sorts of dependencies hiding in there, and it was overwriting some of the admin variables. Better to keep things separate and simple.

I discovered that there was one legitimate reason for importing them though: for styling the trix editor. I can't think of a good way to safely import them without affecting the other variables, so I just hardcoded the colours for now.
 2023-08-03 09:47:44 +10:00
David Cook
9207724779 Copy legacy variables 
I'd like to go through and remove these, but it will have to happen another day.
 2023-08-03 09:47:44 +10:00
David Cook
828df3ed82 Consistently use red in forms 
Errors and required fields now use the colour from the palette. The error messages in the old design are a bit darker now, but I think it's clearer. And it makes the new design look way better.

Also snuck in a tiny padding tweak.
 2023-08-03 09:47:44 +10:00