raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-29 21:17:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,117 Commits 20 Branches 451 Tags
ff68303ef6bd4e31a7b381b4c005e2e64c8ce1ff
Commit Graph

6005 Commits

Author SHA1 Message Date
Luis Ramos
b879439d58 Use rubocop auto correct to fix Style/SafeNavigation issue 2020-06-22 16:51:46 +01:00
Luis Ramos
f848a89a00 Rename update_attributes to update #rails4 2020-06-22 16:51:43 +01:00
Luis Ramos
46a1c1cf26 Fix rubocop issue 2020-06-22 13:08:54 +01:00
Luis Ramos
473fee19eb Fix rubocop issues 2020-06-22 13:03:18 +01:00
Luis Ramos
6eebb0e399 Use rubocop autocorrect to fix rubocop issue 2020-06-22 12:58:33 +01:00
Luis Ramos
3b91dd9dea Use rubocop auto-correct to fix more issues 2020-06-22 12:51:47 +01:00
Luis Ramos
5d710f1e24 Use ruboccop autocorrect to fix issues 2020-06-22 12:46:07 +01:00
Luis Ramos
8a9dae0ee2 Run rubocop autocorrect 
This is the result of bundle exec rubocop --auto-correct
 2020-06-22 12:23:10 +01:00
Luis Ramos
57d925a7de Add new rubocop rules and fix the single offence 2020-06-22 12:19:19 +01:00
Matt-Yorkley
444097c75f Merge pull request #5559 from luisramos0/display_only_shop 
Make display only shops work again
 2020-06-19 11:12:55 +02:00
Matt-Yorkley
5a480439ca Remove test for items from previous orders looking in cart dropdown 
This feature has been removed
 2020-06-18 22:21:55 +02:00
Matt-Yorkley
042b4fc395 Remove tests for viewing previous order items in cart dropdown 
This behavior has been removed
 2020-06-18 22:21:55 +02:00
Matt-Yorkley
8ac971651c Fix flaky spec 2020-06-18 22:21:55 +02:00
Matt-Yorkley
459e53f43d Adjust specs for new cart display 2020-06-18 22:21:55 +02:00
Luis Ramos
f6e3e01a10 Extract permitted payment_source attributes from checkout to use them in the backoffice payments controller 
Add spec to verify payment source attributes are passed
 2020-06-18 09:54:34 +01:00
Pau Pérez Fabregat
8f885dd1c5 Merge pull request #5628 from Matt-Yorkley/flaky-caching-spec 
Flaky caching spec
 2020-06-18 09:37:45 +02:00
Luis Ramos
06a37d8ff0 Merge pull request #5566 from rioug/5132-no-error-when-product-csv-malformed 
Add handling of CSV::MalformedCSVError for product_importer
 2020-06-17 19:58:35 +01:00
Luis Ramos
5163317b10 Merge pull request #5623 from luisramos0/zones 
Make Zones editable again
 2020-06-17 19:41:20 +01:00
Matt-Yorkley
64b5bde952 Wait for page to actually load after visit shops_path 2020-06-17 12:47:08 +02:00
Matt-Yorkley
86fe032cdb Update calls to #update_attributes! (Rails 4 Rubocop violation) 2020-06-17 12:37:20 +02:00
Matt-Yorkley
640c9e6d2b Re-enable flaky spec 2020-06-17 12:36:42 +02:00
Luis Ramos
01e27dd68c Merge pull request #5492 from pacodelaluna/include-negative-tax-adjustments-in-sales-report 
Include adjustments with negative taxes on Sales Tax reports
 2020-06-16 20:23:04 +01:00
Luis Ramos
2fcafdcf45 Add spec to cover editing zones 2020-06-16 15:13:54 +01:00
Luis Ramos
774b75b649 Make zones spec faster by going directly to zone list page withouth repeating the navigation through Configuration menu 2020-06-16 14:06:01 +01:00
François Turbelin
9abe41f6cb Use OrderTaxAdjustmentsFetcher service 2020-06-16 14:01:27 +02:00
Matt-Yorkley
cf214251fa Set flaky caching spec to pending 2020-06-16 12:59:58 +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
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
ea8c5d2711 Comment out flaky spec 2020-06-15 11:01:35 +01:00
Luis Ramos
02b351b9d5 Make display only shops work again, this will show the product list when the OC is open but ship and pay methods are not available 
Add spec to cover display only shops, it's oficially a feature now :-)
 2020-06-12 20:15:08 +01: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
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
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
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
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
Gaetan Riou
359c0b9d85 fix typo 2020-06-11 16:54:00 +10:00
Gaetan Riou
d3943bc92a refactor error handling of CSV::MalformedCSVError and fix some typos 2020-06-11 16:47:58 +10:00
Luis Ramos
113533e3b1 Merge pull request #5557 from Matt-Yorkley/reports-improvement 
Improve performance in various reports
 2020-06-10 18:54:51 +01:00
Maikel Linke
7d53b12baf Preserve sorting by completion date 2020-06-10 10:19:15 +10:00
Maikel Linke
680ee3dc86 Check the bulk invoice rendering order 
As it turns out, our performance optimisation with `find_each` overrides
or custom sorting.
 2020-06-10 10:05:47 +10:00
Luis Ramos
0c1ed1731d Add more specs to ship method controller 2020-06-09 12:33:55 +01:00
Luis Ramos
87292a8ce5 Refactor spec to add more similar specs 2020-06-09 12:15:52 +01:00