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
26,333 Commits 20 Branches 451 Tags
c43834915dabdcbbcf07ea2df1ed4bdefd4abda2
Commit Graph

14070 Commits

Author SHA1 Message Date
Mohamed ABDELLANI
c43834915d sales_tax_totals_by_order report 2023-02-20 14:19:08 +01:00
Filipe
2f0e00370b Merge pull request #10385 from rioug/10350-BUU-read-only-product-list-take-2 
New product page, add missing column and handle formatting
 2023-02-16 18:41:05 +00:00
Filipe
f6c9246e20 Merge pull request #10343 from jibees/9538-track-404-errors-in-bugsnag 
Notify bugsnag on 404 errors
 2023-02-16 17:45:41 +00:00
Konrad
11e9329b97 Merge pull request #10351 from rioug/9874-order-cycle-creation-fix-needless-warning-and-data-loss 
Order cycle creation, fix needless warning and add warning to prevent data loss
 2023-02-16 16:08:37 +01:00
Rachel Arnould
1a7598d96d Merge pull request #10428 from jibees/9145-Splitcheckout,-add-error-message-when-no-shipping-methods-are-available-to-the-customer 
SplitCheckout: improve error messages in flash banner to improve user experience
 2023-02-16 15:33:12 +01:00
Jean-Baptiste Bellet
2eec3d625a Notify bugsnag on 404 errors 2023-02-16 13:45:42 +00:00
Filipe
e3fa933699 Merge pull request #10381 from anansilva/8229-listing-orders-payment-state-cancelled-order 
Update payment (cash/EFF) state on cancelled order
 2023-02-15 12:06:38 +00:00
Jean-Baptiste Bellet
08fb496f55 Don't need to show any ship_address errors if no ship selected nor 
if the ship_address is the same than the billing one
 2023-02-15 09:52:24 +01:00
Jean-Baptiste Bellet
a39598d049 Reorder error messages to improve readability 
tbs;
 2023-02-15 09:52:10 +01:00
Jean-Baptiste Bellet
9a03023b6b Replace bill_address phone by Customer phone to improve readability 
TBS;
 2023-02-15 09:44:26 +01:00
Gaetan Craig-Riou
eb67340c52 Simplify usage of UnsavedChangesController 
Remove the need to manually bind handleSubmit to onSubmit event
 2023-02-15 10:51:23 +11:00
Gaetan Craig-Riou
75ed68c9cb UnsavedChangesController, automatically add onChange event handler to form elements 2023-02-15 10:30:52 +11:00
Gaetan Craig-Riou
1cf55cde4d Refactor column_value, to use a giant case 
A giant case is more readable that the previous 'smart' solution.
It also disables a couple of Rubocop checks triggered by the giant case
 2023-02-14 13:36:49 +11:00
Gaetan Craig-Riou
503e0ecba1 Fix category spec as per code review 
- Use a hardcoded string for the expected categories (taxons), and fix
taxon step up to not use default taxon
- Fix constant typo
 2023-02-14 13:36:12 +11:00
Jean-Baptiste Bellet
32fc1eae61 Remove ship_address errors if shipping method isn't selected 2023-02-13 21:06:41 +01:00
jibees
d9d18b086c Merge pull request #10410 from mkllnk/api-customers-order 
Sort customers by id on API v1
 2023-02-13 10:41:13 +01:00
Maikel Linke
a08c7f7823 Sort customers by id on API v1 2023-02-10 15:52:35 +11:00
Jean-Baptiste Bellet
b1d22f7982 Customer can be nil if first time they checkout 2023-02-09 17:11:11 +01:00
Konrad
73d98bd1b4 Merge pull request #10322 from jibees/8027-performance-improvement-on-adminenterprises 
For super admin, add pagination on `/admin/enterprises`
 2023-02-08 09:04:41 +01:00
Gaetan Craig-Riou
fd278e0086 Fix bug when submitting form triggered a warning and potentially left submit button disable 
jquery-ujs automatically disable submit button when submitting the form.
If one choose cancel on the leaving page warning, then the submit buttons
end up in a disable state, with no way to re enable them. This fix
prevent the warning from being triggered when submitting the form, so
we can't end up in the scenario described.
 2023-02-08 16:28:41 +11: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
Gaetan Craig-Riou
722b04a211 Add missing collumns on new_products page 
It also includes specs for ProductComponent
 2023-02-08 12:04:05 +11:00
Jean-Baptiste Bellet
80ba228910 Partial is used in two different contexts: orders and line_items 
Distinguish them by adding a local variable model that could either be `orders` or `line_items`
 2023-02-07 18:10:29 +01:00
Ana Nunes da Silva
f4980fa84d Update void payments to checkout on resumed order 2023-02-07 12:29:59 +00:00
Ana Nunes da Silva
c9e6d24eb0 Add :resume event in Spree::Payment 2023-02-07 12:27:15 +00:00
Ana Nunes da Silva
f2b407c194 Add :void scope in Spree::Payment 2023-02-07 12:27:15 +00:00
Ana Nunes da Silva
b48b3ad42b Update: Untaken cash payments to void on cancelled order 2023-02-07 12:27:07 +00:00
Ana Nunes da Silva
8bd890f311 Add :checkout scope in Spree::Payment 2023-02-06 11:09:40 +00: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
Jean-Baptiste Bellet
d00e75de70 We should load orders that are linked to line_items displayed 
This should not be related to any pagination, search or whatever: actually we consolidate line_items with order additional info based on line_items.order.id.
 2023-02-03 11:40:07 +01:00
Jean-Baptiste Bellet
06cbc120f5 Pagination is actually linked to line_items and not orders 
We display line_items as rows in BOM
 2023-02-03 11:37:51 +01:00
Jean-Baptiste Bellet
9b2ed8846c load_enterprise_set_on_index is used only in one action 
so let's call it inside the action.
 2023-02-03 09:15:07 +01:00
Jean-Baptiste Bellet
e18454c55a Add pagination on enterprises page for super admin 
Enterprises are stored in `@enterprise_set` variables, and we iterate over to show the list of enterprises to super admin.

Previously, we used to use `Sets::EnterpriseSet.new(collection)` instead of creating set based on `@collection`: this leads to call the `collection` method twice, which was probably very time consuming. This commit fix also that.

+ use paginated enterprises loading on bulk update but without testing if the current user is an admin
 2023-02-03 09:15:07 +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
Jean-Baptiste Bellet
915174b513 Do not stack same flash messages 
Very ugly in UI.
 2023-02-02 15:28:35 +01: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
Filipe
095e520777 Merge pull request #10339 from mkllnk/ssl 
Remove unnecessary SSL code
 2023-02-01 13:06:26 +00:00
Gaetan Craig-Riou
5cfedddba4 UnsavedChanges controller, disabling submit button is now optional 2023-02-01 13:46:30 +11:00
Gaetan Craig-Riou
dd876dfd8d Order cycle form, disable the save and save and back button on page load 
Buttons will be enabled once the form has been interacted with.
Update unsavedChanges stimulus controller to handle this. It should
still be generic enought that it can be reused.
 2023-02-01 09:43:28 +11:00
Gaetan Craig-Riou
ef309c0fd0 Order cycle form, checkout options steps add user warning when leaving page and form has been changed 
Add UnsavedChanges stimulus controller, it should be generic enough so
that it can reused somewhere else. It works with both 'beforeunload' event
and 'turbolinks:before-visit' when using turbo links.
 2023-02-01 09:43:28 +11:00
Gaetan Craig-Riou
de97c59632 Order cycle exchange form, only set red border on pickup_time field if empty 
The red border is set by setting pickup_time as $dirty, it then blocks next button and add leave page warning when it is not necessary, this is a fix for it.
 2023-02-01 09:43:28 +11: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
Maikel Linke
0fc108a8e6 Remove useless option to allow SSL 
It's an outdated Spree setting. We always enforce SSL in production and
staging while development and test environments are running without SSL.
This setting didn't have any effect.
 2023-01-30 14:19:37 +11:00
Maikel
4193cdb9f1 Merge pull request #10320 from dacook/remove-ie-warning 
Remove unnecessary IE warning
 2023-01-27 17:02:53 +11:00
David Cook
57678b7566 Remove IE warning 
It brings me great pleasure to remove this. I've been waiting my whole career: IE is finally gone!!
 2023-01-27 12:45:46 +11: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
Filipe
1ea7304549 Merge pull request #10276 from jibees/10250-split-checkout-responsiveness-is-broken-on-iphone 
Split Checkout, increase input to 16px for small devices and iOS devices
 2023-01-25 17:32:10 +00: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