raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-11 23:17:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,241 Commits 19 Branches 453 Tags
d65b1bb38681644f8f6a4f1ef83c1906b66f24dc
Commit Graph

9205 Commits

Author SHA1 Message Date
Jean-Baptiste Bellet
d65b1bb386 Fix various import issue: mock bugsnag 2023-02-09 16:50:40 +01:00
Jean-Baptiste Bellet
2633ee3606 Fix various import issue: taxons 2023-02-09 16:50:40 +01:00
Jean-Baptiste Bellet
4027eacc06 Fix various import issue: module('admin.enterprises') 2023-02-09 16:50:40 +01:00
Jean-Baptiste Bellet
236e77efd4 Fix various import: CurrentUser 2023-02-09 16:50:40 +01:00
Jean-Baptiste Bellet
a486a08bfc Fix various import issues: currentHub 2023-02-09 16:50:40 +01:00
Maikel
66a29e58d2 Merge pull request #10340 from mkllnk/job-process-waiting 
Wait only for report jobs within Puma workers
 2023-02-08 14:26:43 +11:00
Filipe
0f203a474c Merge pull request #10375 from jibees/10363-bom-page-is-not-finding-or-displaying-name-email-or-order-number-for-some-orders 
BOM: Ensure orders informations are loaded for each line items
 2023-02-07 16:34:57 +00:00
Maikel
9ff8433a8d Merge pull request #10344 from filipefurtad0/update_orders_spec_II 
Update orders spec ii
 2023-02-06 14:32:14 +11:00
Jean-Baptiste Bellet
bddd887dcd Load orders only if current line_items are loaded 
+ update spec as well
 2023-02-03 12:25:47 +01:00
jibees
5e689b12fe Merge pull request #10345 from mkllnk/rspec-n 
Enable RSpec's status file for --next-failure
 2023-02-02 16:54:37 +01:00
Filipe
99a0056d7f Merge pull request #10257 from rioug/9720-fix-imperial-weight-display-when-using-float-value 
Fix decimal display for imperial weight on Cart, Order Confirmation page and Confirmation emails
 2023-02-02 15:03:39 +00:00
Rachel Arnould
0973e79a91 Merge pull request #10274 from jibees/8905-convert-popup-to-flash-messages- 
On `/cart` page, if consumer adds more quantity than available, use in-app flash message instead of native alert
 2023-02-02 15:50:17 +01:00
Filipe
d0897ec677 Merge pull request #10248 from jibees/10117-reports-in-order-cycle-customer-totals-incorrect-sorting-when-lastname-first-letter-isnt-capitalized 
Reports, Orders and fulfillment: Sort by customer lastname + firstname case insensitive
 2023-02-02 14:39:10 +00:00
Jean-Baptiste Bellet
f5aae5f8b9 Remplace ouf of stock alert by Flash message 2023-02-02 15:28:35 +01:00
Filipe
1e3f754f96 Merge pull request #10318 from dacook/10272-remove-currency-from-calculators 
Remove unused currency from calculators
 2023-02-01 13:49:51 +00:00
David Cook
01c6a8b9ec Merge pull request #9850 from openfoodfoundation/dependabot/bundler/rspec-rails-6.0.1 
Bump rspec-rails from 5.1.2 to 6.0.1
 2023-02-01 11:43:57 +11:00
filipefurtad0
5d4ab5c1f8 Adds the bang! when updating DB entries 2023-01-31 12:20:26 +00:00
Maikel Linke
d3251dc03f Enable RSpec's status file for --next-failure 
With this config, we can use `rspec -n` which is shorthand for:

  rspec --only-failures --fail-fast --order defined

This is much easier than running specs by line numbers.
 2023-01-31 15:45:21 +11:00
Maikel Linke
d3b80b7fc9 Clarify expecting a hash, not keyword arguments 
The syntax was ambiguous and nwer version of rspec-rails catch that.
 2023-01-31 15:40:33 +11:00
filipefurtad0
444d689f14 Adds ordering by order total 2023-01-30 20:12:38 +00:00
filipefurtad0
801ebe5819 Adds ordering by billing address name 2023-01-30 20:12:38 +00:00
filipefurtad0
7f4e5d3f2e Adds ordering by customer name 2023-01-30 20:12:38 +00:00
filipefurtad0
107bb3df66 Adds ordering by shipment state 2023-01-30 20:12:38 +00:00
filipefurtad0
dcbf2ae96b Removes assertions on the Loading element 2023-01-30 20:12:38 +00:00
filipefurtad0
f2c0a77641 Adds ordering by payment state 2023-01-30 18:39:51 +00:00
filipefurtad0
958a1bde9f Adds ordering by order state 2023-01-30 17:35:23 +00:00
filipefurtad0
cff06011f1 Fixes rubocop issues; Adds ordering by order number 2023-01-30 17:21:29 +00:00
filipefurtad0
0e878d8ce1 Sets context for filters; Adds context for ordering 2023-01-30 17:08:03 +00:00
Filipe
678c60c9b6 Merge pull request #10175 from abdellani/tax_totals_with_rates_by_producer_report 
Tax Totals with Rates by Producer Report
 2023-01-30 13:56:48 +00:00
Maikel Linke
1609cc49e3 Wait only for report jobs within Puma workers 
Otherwise a root Puma worker will try to wait for its other child
processes as well while they live a long time.
 2023-01-30 16:28:59 +11:00
filipefurtad0
994232f6d1 Adds pagination test on orders page 2023-01-28 17:50:28 +00:00
Filipe
1cfc13e66f Merge pull request #10208 from jibees/9424-calculator-provide-a-calculator-none 
Admin: Include a "None" option for calculator type user in shipping method and payment method forms
 2023-01-26 14:48:41 +00:00
jibees
e48ba1b5fa Specify assertions by grouping them into page section 
Co-Authored-By: Filipe <49817236+filipefurtad0@users.noreply.github.com>
 2023-01-26 15:06:00 +01:00
Jean-Baptiste Bellet
999440da0a Fix errors count when user submit the form 
Since https://github.com/openfoodfoundation/openfoodnetwork/pull/10317 we are displaying the error message also in the flash message. For unknown reason, build didn't fail for that PR, but, as the PR adds some error message, we need to change the spec to reflect that change.

This PR separates error in checkout page itself, and errors in flash message banner.
 2023-01-26 11:05:55 +01:00
Filipe
ad4670705e Merge pull request #10245 from jibees/10222-in-bom-dont-show-group-buy-info-if-equal-to-0 
Admin, BOM: Don't display "group by size" if group by product value is actually null
 2023-01-25 15:29:05 +00:00
Maikel Linke
cec9d2987e Name order attributes similar to other text 
Rails' auto-generated names used in error messages were a bit cryptic
for users.
 2023-01-25 15:49:44 +11:00
David Cook
428b589357 Remove unused currency from calculators 2023-01-25 15:31:40 +11:00
Maikel Linke
ab7e1ac39f Display error messages to user for convencience 
It will also help us to debug the application if the error is not
obvious.
 2023-01-25 14:50:28 +11:00
Maikel Linke
0782447863 Drop superflous js flag from system spec 2023-01-25 14:50:28 +11:00
Filipe
f917027cb1 Merge pull request #10249 from jibees/10228-split-checkout-error-422-on-step-2-payment-update-highlighted-fields 
SplitCheckout: Fix an issue that was sending unintentionally bad params for payment
 2023-01-24 10:31:49 +00:00
Maikel Linke
79887c0b44 Clarify array intend of array operation in spec 2023-01-24 14:17:46 +11:00
Maikel Linke
5b6a855dfe Clarify test result structure 2023-01-24 13:39:48 +11:00
Maikel Linke
d18d0ef6b1 Parse JSON to test variant and distributor ids 
We looked at the whole JSON string before and sometimes a distributor id
would match a variant id which made the test flaky.
 2023-01-24 11:51:44 +11:00
Maikel Linke
d37fa9fc5f Simplify spec structure without defining modules 
Specs should test classes and modules independently and they should not
be in the same module. It also avoids indentation and accidental
namespace polution.
 2023-01-24 11:41:06 +11:00
Filipe
7b14afbabe Merge pull request #10294 from abdellani/fix_invoice_print_spec 
fix the pending invoice print spec
 2023-01-23 19:06:36 +00:00
Filipe
bc788b6d60 Merge pull request #10243 from jibees/10242-change-how-orders-are-loaded-in-bom-+-filters 
Admin, BOM: add pagination, remove date range filtering on first load
 2023-01-23 17:48:05 +00:00
Jean-Baptiste Bellet
251ab2ac9a Payment method id attribute don't need to start with paymentmethod 2023-01-23 17:46:26 +01:00
Filipe
d7c99a9d8b Merge pull request #10275 from filipefurtad0/update_orders_spec 
Updates system spec for orders page
 2023-01-23 16:00:38 +00:00
Rachel Arnould
53fb906861 Merge pull request #10254 from jibees/10246-split-checkout-order-summary-page-design-changes 
Split checkout: order summary page design changes
 2023-01-23 15:52:06 +01:00
filipefurtad0
fa96f7339d Replaces URL with routing syntax 2023-01-23 11:35:53 +00:00