raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,538 Commits 21 Branches 450 Tags
70634dc0c19acb9ddd77cf1e82c8396b83eb08cd
Commit Graph

1562 Commits

Author SHA1 Message Date
Matt-Yorkley
0d7bb2ff90 Update sorting by name in supplier report 2021-11-04 22:08:27 +00:00
Matt-Yorkley
c6ef14e9ee Update masking in supplier report 2021-11-04 22:08:10 +00:00
Matt-Yorkley
373fc2e22e Update show_customer_names_to_suppliers check 2021-11-04 14:55:23 +00:00
Matt-Yorkley
924f6568d6 Replace data loading with new Reports::QueryInterface 2021-11-04 14:55:23 +00:00
Matt-Yorkley
817f0942dd Pull in reports POC work replacing Packing reports 2021-11-04 14:55:23 +00:00
Luis Azcuaga
e8fd89a6d2 Run rubocop over existing todo 2021-10-25 21:28:28 -05:00
Maikel
02a10ede15 Merge pull request #7938 from dacook/product-image-import 
Add script to import product images from URL
 2021-09-20 16:57:23 +10:00
Maikel
a3c31f7d86 Revert "Kill stripe connect" 2021-09-20 08:39:34 +10:00
Nihal M. Kelanthodika
9d216f0cea Merge pull request #8160 from apricot12/8019-Delivery_report 
Show order total in Delivery/Payment Method reports instead of first …
 2021-09-15 13:11:43 +05:30
Nihal Mohammed
fa9f6432c3 Fix profile_storer.rb and profile_storer_spec 2021-09-10 14:43:34 +05:30
Nihal Mohammed
6ac835de2e Fix response for payment_profile_id in profile_storer.rb 2021-09-10 14:43:34 +05:30
Luis Ramos
5434b51f75 Switch filter to StripeSCA, this must have been an error, must be tested (manually or automatically) 2021-09-10 14:41:06 +05:30
Nihal
43e6d1b933 Show order total in Delivery/Payment Method reports instead of first payment 2021-09-10 13:08:00 +05:30
Maikel
9affc6a945 Merge pull request #8108 from Matt-Yorkley/andand 
Remove `andand` gem
 2021-09-10 15:06:00 +10:00
Andy Brett
f8486bcbf8 Merge pull request #7769 from Matt-Yorkley/payment-status-checking 
Stripe: payment status debugging
 2021-09-08 15:21:38 -07:00
Matt-Yorkley
1d5077061e Remove andand 
This old gem implemented some functionality for handling nils which is no longer needed, as it's provided natively by Ruby with the &. operator.
 2021-09-08 14:28:31 +01:00
Matt-Yorkley
1d472d0dec Add Rack Middleware for transitioning existing sessions 
This checks if the current request has been submitted using the old session key (_session_id) and transparently migrates the session id to a new session cookie with the new settings and the new key (_ofn_session_id).
 2021-08-22 15:57:43 +01:00
Matt-Yorkley
2a5675c526 Merge pull request #7746 from Matt-Yorkley/puma 
Puma
 2021-08-05 11:55:05 +02:00
Matt-Yorkley
5725989343 Fix deprecated syntax in old controller helper 
This syntax for rendering a file isn't valid in Rails 6.x...
 2021-07-31 13:11:10 +01:00
Jean-Baptiste Bellet
09491cfc6d Only return order with the selected shipping rates is true 
Same concept as

https://github.com/openfoodfoundation/openfoodnetwork/blob/master/app/services/search_orders.rb#L31
 2021-07-28 17:05:50 +02:00
Matt-Yorkley
886e03af2f Merge pull request #7805 from Matt-Yorkley/adjustments-admin 
[Adjustments] Admin adjustments
 2021-07-27 12:23:29 +02:00
Matt-Yorkley
9d4b34b35b Merge pull request #7977 from Matt-Yorkley/tidy-up 
Spree tidy-up
 2021-07-27 11:52:22 +02:00
Luis Ramos
d1f1f62f9a Add needed constant to class eval 2021-07-25 16:08:30 +01:00
Luis Ramos
02b4693068 Fix class name 2021-07-25 16:08:30 +01:00
Luis Ramos
4057445562 Replace setup_intents class from active merchat v1.i98 with a decorator that will adapt the version in v1.119 2021-07-25 16:06:49 +01:00
Matt-Yorkley
2d69810c5d Convert CalculatedAdjustments into a proper Concern and remove class_eval 2021-07-24 21:28:13 +01:00
David Cook
c156d0c2e6 Add script to import product images from URL 
With new ImageImporter.

Co-authored-by: Maikel <maikel@email.org.au>
 2021-07-16 11:36:49 +10:00
Nihal Mohammed
e5bdaa603a Setup pagy 2021-07-14 13:17:33 +01:00
Matt-Yorkley
12c9914d1b Delete old Adjustment scopes #with_tax and #without_tax 2021-07-09 21:49:36 +01:00
Andy Brett
718f9c4af8 Merge pull request #7848 from jibees/7842-locale-management-on-user_passwords-controller 
Handle lang management on user passwords controller
 2021-07-09 08:55:09 -07:00
Matt-Yorkley
32a2610e7d Refactor arguments for PaymentIntentValidator 2021-07-09 13:42:41 +01:00
Matt-Yorkley
e5a85caef6 Refactor Stripe::PaymentIntentValidator 
This makes the interface a lot simpler and moves the fetching of the information it requires inside the service itself.
 2021-07-09 13:39:52 +01:00
Jean-Baptiste Bellet
1a8a12fb0c Filter language to not display the current lang in the dropdown 
No need to set a lang that is actually already set
 2021-07-08 09:15:09 +02:00
Andy Brett
334b9b520a removed deprecated calls to force_ssl; rely on config.force_ssl 2021-06-24 11:58:33 -07:00
Andy Brett
df0c98d013 Merge branch 'master' into rails61 2021-06-24 08:02:58 -07:00
Andy Brett
92216cc1c7 Merge pull request #7761 from apricot12/show_variant_SKU_in_xero 
Show product variant SKU in Xero report
 2021-06-23 08:59:15 -07:00
Pau Pérez Fabregat
aa9a85159e Merge pull request #7806 from mkllnk/feature-toggles 
Remove custom feature toggles
 2021-06-18 12:23:21 +02:00
Maikel Linke
a8eecf963d Remove unused custom FeatureToggle implementation 
Flipper is now our only source of truth regarding feature toggles.
 2021-06-18 10:46:51 +10:00
Maikel Linke
bba85e5e79 Remove feature toggling via ENV vars 
We don't use ENV vars for feature toggles any more. Flipper is much
easier to manage.
 2021-06-18 10:46:51 +10:00
Luis Ramos
e52937c113 Use rubocop auto correct to add frozen string literal to all files 
This is an unsafe auto corection, we will need to trust our build here
 2021-06-17 23:07:26 +01:00
Luis Ramos
a253228b96 Add some rubocop disable commands in the code to avoid future wrong rubocop auto corrections 2021-06-17 22:26:54 +01:00
Luis Ramos
de76a1d41e Manually fix rubocop issue (unsafe auto correct would be wrong) 2021-06-17 22:20:28 +01:00
Luis Ramos
23627c5453 Run rubocop -a (safe corrections) removing all exceptions so all possible fixes are applied 
9290 issues fixed
 2021-06-17 22:19:26 +01:00
Pau Pérez Fabregat
a8efbffca6 Merge pull request #7429 from Matt-Yorkley/adjustments-taxrate 
[Adjustments] TaxRate changes
 2021-06-17 11:51:01 +02:00
Luis Ramos
43401e4b5e Fix double spree scope in i18n 
Fix taken from spree: efba9f1a02
 2021-06-13 18:19:29 -07:00
Nihal Mohammed
3b73f72ac2 Show product variant SKU in Xero report 2021-06-08 19:53:55 +05:30
Matt-Yorkley
3544b7de7a Remove Stripe Decorator 
The method being overridden here is the same in the upstream
 2021-06-07 20:44:58 +01:00
Matt-Yorkley
7b641ace23 Update Xero Invoices scopes for taxable fees 
Taxable enterprise fee adjustments now have a tax_category
 2021-06-06 20:20:41 +01:00
Matt-Yorkley
2de442f44d Move taxing of enterprise fees to TaxRate 2021-06-06 20:16:03 +01:00
Matt-Yorkley
8c9733d8da Remove included tax check from CalculatedAdjustments 
This is handled in TaxRate now.
 2021-06-06 20:16:03 +01:00