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
15,990 Commits 21 Branches 450 Tags
ff4d7fbc45f9ef303cedff64fc0ca710e11a48e2
Commit Graph

15990 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pau Perez
ff4d7fbc45 Refactor with Arel to perform a single query 2020-06-16 14:01:27 +02:00
Pau Perez
00c9dd7ece Remove N+1 fetching order and li adjustments 2020-06-16 14:01:27 +02:00
François Turbelin
b4952dcbfb Cosmetics 2020-06-16 14:01:27 +02:00
François Turbelin
9abe41f6cb Use OrderTaxAdjustmentsFetcher service 2020-06-16 14:01:27 +02:00
François Turbelin
c729f64fcf Include adjustments without positive taxes 2020-06-16 14:01:27 +02:00
Luis Ramos
7db519ab62 Merge pull request #5570 from luisramos0/ship_methods_form 
[Spree 2.1] Make Shipping methods form save calculator details
 2020-06-15 15:05:50 +01:00
Pau Pérez Fabregat
257b311e04 Merge pull request #5158 from openfoodfoundation/3-0-stable 
Merge 3-0-stable to master
 2020-06-15 13:35:58 +02:00
Pau Pérez Fabregat
62fe54d90d Merge pull request #5604 from luisramos0/xit_vo_flaky_2 
Comment out flaky variant overrides spec
 2020-06-15 13:11:24 +02:00
Luis Ramos
d5bdf306a9 Comment out flaky variant overrides spec 2020-06-15 11:43:30 +01:00
Luis Ramos
538d886c83 Merge pull request #5573 from Matt-Yorkley/payment-report-500 
Fix fatal error in reports helper for orders without payments
 2020-06-15 11:27:17 +01:00
Luis Ramos
c113ee92e6 Merge pull request #5603 from luisramos0/xit_exchange_prods 
Comment out Exchange Products Renderer spec
 2020-06-15 11:13:50 +01:00
Luis Ramos
d82a1c3bf1 Merge pull request #5602 from coopdevs/fix-style-issues 
Fix outstanding Rubocop violations
 2020-06-15 11:13:21 +01:00
Luis Ramos
ea8c5d2711 Comment out flaky spec 2020-06-15 11:01:35 +01:00
Pau Pérez Fabregat
e2e3b16250 Merge pull request #5549 from luisramos0/vo_flaky 
[Spree 2.1] Make Variant Overrides spec less flaky and... comment it anyway
 2020-06-15 12:00:16 +02:00
Pau Perez
456f369b76 Fix outstanding Rubocop violations 2020-06-15 10:17:34 +02:00
Pau Perez
29246c15fe Defend from order without billing address 
This a data integrity issue that needs deeper investigation but while
this happens, our users can still render their reports.
 2020-06-12 16:34:23 +02:00
Luis Ramos
6dcb2d4a3b Add xit, spec is still too flaky on semaphore 
It's not the most important spec, this scenario should never happen as
the user will not be able to access the page.
 2020-06-12 15:33:34 +01:00
Luis Ramos
f56e0ba0c0 Mock current_spree_user to return a user without permissions so that the controller does not use an already loaded version of current_spree_user that still has enough permissions 2020-06-12 14:23:45 +01:00
Luis Ramos
cf5af68438 Make spec less flaky by making it wait for the Saving text to go away 2020-06-12 13:04:33 +01:00
Luis Ramos
72870530ce Merge pull request #5594 from Matt-Yorkley/3-0-reports-subquery 
[Spree 2.1] Fix "subquery has too many columns" in reports query
 2020-06-12 12:42:04 +01:00
Matt-Yorkley
86db1b6d68 Fix "subquery has too many columns" in reports query 2020-06-12 12:55:50 +02:00
Pau Pérez Fabregat
034c3d9568 Merge pull request #5548 from luisramos0/3-0-stable-jun-2 
[Spree 2.1] Merge master into 3-0-stable
 2020-06-12 11:27:29 +02:00
Pau Pérez Fabregat
a91c81059f Merge pull request #5588 from openfoodfoundation/transifex 
Transifex
v2.10.1 		2020-06-12 11:00:10 +02:00
Luis Ramos
7245a80f94 Merge branch 'master' into 3-0-stable-jun-2 2020-06-12 09:22:47 +01:00
Transifex-Openfoodnetwork
10f0958819 Updating translations for config/locales/fr_CA.yml 2020-06-12 12:19:08 +10:00
Transifex-Openfoodnetwork
fce74bd008 Updating translations for config/locales/es.yml 2020-06-12 12:19:00 +10:00
Transifex-Openfoodnetwork
9908692da9 Updating translations for config/locales/en_FR.yml 2020-06-12 12:16:07 +10:00
Transifex-Openfoodnetwork
ff0e3ed379 Updating translations for config/locales/fr.yml 2020-06-12 12:16:00 +10:00
Transifex-Openfoodnetwork
2914500d5b Updating translations for config/locales/ca.yml 2020-06-12 12:15:53 +10:00
Luis Ramos
898d525201 Merge pull request #5552 from coopdevs/remove-forgotten-photos 
Remove unused stock photo
 2020-06-11 20:41:01 +01:00
Luis Ramos
e2265dd165 Fix issue in product_spec 2020-06-11 20:26:57 +01:00
Luis Ramos
983bed3c4e Merge branch 'master' into 3-0-stable-jun-2 2020-06-11 19:50:56 +01:00
Transifex-Openfoodnetwork
17bf163378 Updating translations for config/locales/fr_CA.yml 2020-06-12 03:53:33 +10:00
Transifex-Openfoodnetwork
e371c5f788 Updating translations for config/locales/en_CA.yml 2020-06-12 03:48:39 +10:00
Pau Pérez Fabregat
5cca8693b3 Merge pull request #5540 from romale/patch-1 
Missing translation key "return_authorizations"
 2020-06-11 16:39:15 +02:00
Transifex-Openfoodnetwork
bfcf5f8ca0 Updating translations for config/locales/ca.yml 2020-06-12 00:38:46 +10:00
Transifex-Openfoodnetwork
ab76319861 Updating translations for config/locales/en_FR.yml 2020-06-12 00:35:51 +10:00
Transifex-Openfoodnetwork
30917c64f5 Updating translations for config/locales/fr.yml 2020-06-12 00:35:44 +10:00
Transifex-Openfoodnetwork
6d7c1b7933 Updating translations for config/locales/es.yml 2020-06-12 00:35:36 +10:00
Pau Perez
9d5c657ff9 Update all locales with the latest Transifex translations 2020-06-11 15:49:05 +02:00
Pau Pérez Fabregat
e0bcc71882 Merge pull request #5569 from rmklaus12/5204-inventory-translation 
Add translation keys to en.yml file for variant_override error messag…
 2020-06-11 15:35:30 +02:00
Pau Pérez Fabregat
06feae994d Merge pull request #5353 from pacodelaluna/sort-invoices-in-bulk-invoice-with-forced-order 
Sort invoices in bulk invoice with completed_at desc order
 2020-06-11 15:34:39 +02:00
Pau Pérez Fabregat
2052756169 Merge pull request #5556 from Matt-Yorkley/geocoding-service 
Rename Angular Geo service
 2020-06-11 15:19:08 +02:00
Pau Pérez Fabregat
bc8a10c6a0 Merge pull request #5541 from luisramos0/has_variants 
Delete dead code related to products without variants
 2020-06-11 15:18:13 +02:00
Pau Pérez Fabregat
01a9b33fc9 Merge pull request #5482 from rmklaus12/5094-new-order-translation 
created partial for order page title to resolve French translation of…
 2020-06-11 13:23:28 +02:00
Pau Pérez Fabregat
ab743c3af9 Merge pull request #5407 from luisramos0/oc_sweep 
Order Cycle design sweep
 2020-06-11 12:49:04 +02:00
Pau Pérez Fabregat
246a4995cb Merge pull request #5490 from luchiago/change-price-sack-amount-int-to-float 
Change minimal amount in price sack calculator to float
 2020-06-11 12:42:11 +02:00
Matt-Yorkley
e725f33318 Defend from an order w/o payments when building table 2020-06-11 12:37:51 +02:00
Matt-Yorkley
e84e0aebe6 Fix fatal error in reports helper for orders without payments 2020-06-11 11:22:07 +02:00
Pau Pérez Fabregat
75d24c19fc Merge pull request #5206 from chrishil1/clear_filters 
Clear filters on admin/products page
 2020-06-11 10:37:17 +02:00