raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-17 00:07:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,748 Commits 15 Branches 453 Tags
35e20fc179da821ca2a65f19b30ff90b79e90621
Commit Graph

12652 Commits

Author SHA1 Message Date
Matt-Yorkley
35e20fc179 Can sort orders via bill_address.lastname 
We only need to check the orders sort

Fix ordering in api/v0/orders_controller_spec
 2021-12-16 09:33:38 +01:00
Matt-Yorkley
45beefc533 Keep the order of passed argument 
Do not retrieve the orders list sorted by completed_at but by the order_ids array itself

Add BulkInvoiceJob spec and cover sorting behaviour
 2021-12-16 09:33:38 +01:00
Jean-Baptiste Bellet
7a48ffdd38 Add order.full_name as new column 
+ add the linked sortable header via `bill_address_lastname`
 2021-12-16 09:26:49 +01:00
Jean-Baptiste Bellet
9c280ee612 add new line 2021-12-16 09:26:49 +01:00
Filipe
f7087842b4 Merge pull request #8556 from sinansonmez/8546-include-navigation-only-for-super-admins 
Navigation is included only for super admin users
 2021-12-11 16:34:10 +00:00
Maikel Linke
207cc8908a Remove useless assignments 
Rubocop highlighted this. The todo list actually contains these files
but somehow the cop still runs and reports these as violations.
 2021-12-10 09:26:57 +11:00
Maikel Linke
64d25b2999 Remove dead code highlighted by Rubocop 
The assignments here didn't actually do anything and `number` was
restricted to numbers only already. No whitespace to remove.
 2021-12-10 09:26:57 +11:00
Maikel
65e5291679 Merge pull request #8569 from Matt-Yorkley/dead-code-backordered 
Remove dead code: Order#backordered?
 2021-12-08 18:05:38 +11:00
Matt-Yorkley
290e292dea Revert "Fixed inconsistency with display of unit name for products sold by item" 2021-12-07 13:24:12 +00:00
Matt-Yorkley
87fe341b5b Remove dead code: Order#backordered? 2021-12-05 15:17:27 +00:00
Matt-Yorkley
dcad00d047 Merge pull request #8484 from Matt-Yorkley/stripe-session-checks 
Stripe checkout alerting
 2021-12-05 12:04:00 +00:00
Filipe
89864395ca Merge pull request #8520 from seballot/multiple-flash-messages 
Fix rendering problem with multiple flash messages in the admin section
 2021-12-03 01:05:36 +00:00
Filipe
b2e5a89395 Merge pull request #8487 from jibees/7278-multipe-stripe-form-in-admin-section 
Allow mutiple stripe form in the admin section
 2021-12-03 00:21:03 +00:00
Sinan Chaush
68908fdff5 Navigation is included only for super admin users 2021-12-02 11:53:46 +01:00
Jean-Baptiste Bellet
59eb91c7c8 Remove id "card-element" as well 2021-11-29 10:18:06 +01:00
Jean-Baptiste Bellet
57a94d64f2 Revoke adjustment if payment is cancelled 2021-11-26 16:31:25 +01:00
Sebastian Castro
588420ff93 Fixs #8442 display multiple flash messages correctly 2021-11-26 11:38:43 +01:00
jibees
b39d3bb7de Merge pull request #8492 from shveikus/8479-tab-behaviour-for-login-modal 
Update TAB behavior for the login modal
 2021-11-25 13:42:25 +01:00
jibees
76176b2482 Merge pull request #8498 from drummer83/drummer83-country_first 
Switch the order of 'state' and 'country' input fields
 2021-11-25 13:41:46 +01:00
jibees
439f4ad24c Merge pull request #8497 from drummer83/drummer83-localize_button 
Place the localize button above the map/below the address
 2021-11-25 13:41:19 +01:00
Nihal M. Kelanthodika
74b87adee3 Merge pull request #8500 from apricot12/8495-Variant-unit-name-shopfront 2021-11-25 16:06:06 +05:30
Maikel
5f87c30d3e Merge pull request #8465 from jibees/7963-permission-to-delete-relationship-both-ways 
Manager can delete enterprises relationship in both direction
 2021-11-23 09:20:32 +11:00
Dmitry Shveikus
9bd604cbe9 Update TAB behaviour for login modal 2021-11-22 23:40:22 +03:00
Jean-Baptiste Bellet
b6afdb13fc Use timeout to put in other callback and then update the StatusMessage 2021-11-22 21:39:20 +01:00
Jean-Baptiste Bellet
5575697c9f Add a directive attribute 'selected' that update AdminStripeElements when true 
Filled with `PaymentCtrl.isSelected(payment_method_id)`

Therefore, each time a stripe payment is selected, the one that is actually selected is linked to `AdminStripeElements.card` and `AdminStripeElements.stripe`
 2021-11-22 21:39:20 +01:00
Jean-Baptiste Bellet
5348d26054 Add new "error" attribute in the StatusMessage 
It is used by `admin/payments/services/stripe_elements.js.coffee`
 2021-11-22 21:39:20 +01:00
Jean-Baptiste Bellet
36c12a92f2 Display errors on the right specific DOM element 2021-11-22 21:39:20 +01:00
Jean-Baptiste Bellet
fc779e0237 Mount Stripe element to the specific DOM element 2021-11-22 21:39:20 +01:00
Jean-Baptiste Bellet
f7bf6e1083 Include Stripe js only once in the admin section 2021-11-22 21:39:20 +01:00
Nihal M. Kelanthodika
8a42043701 Fixed inconsistency with display of unit name for products sold by item 2021-11-19 13:39:42 +05:30
Matt-Yorkley
bc5c9ff8e2 Merge pull request #8472 from Matt-Yorkley/notify-resumed 
Include items from resumed orders when mailing producers
 2021-11-18 15:20:08 +00:00
Matt-Yorkley
527a53bd0f Merge pull request #8485 from Matt-Yorkley/stripe-addresses 
Checkout address handling
 2021-11-18 15:19:27 +00:00
Konrad
60d1305b0a Add files via upload 2021-11-18 00:28:49 +01:00
Konrad
87b3b6fa36 Add files via upload 2021-11-18 00:23:05 +01:00
Matt-Yorkley
378d3d5ab6 Merge pull request #8476 from Matt-Yorkley/reports-producers-visibility 
Ensure line items are correctly scoped for producers
 2021-11-17 15:07:37 +00:00
Maikel
c5c09dbcf8 Merge pull request #8483 from Matt-Yorkley/guest-token 
Remove dead code: session[:guest_token]
 2021-11-17 17:07:00 +11:00
Matt-Yorkley
0efa370211 Merge pull request #8405 from jibees/7961-translate-stripe-error-message 
Translate stripe error messages during payment processing
 2021-11-16 11:49:12 +00:00
Matt-Yorkley
ac5766b00b Report current order info on all checkout failures 2021-11-14 20:01:32 +00:00
Matt-Yorkley
f8349434bf Skip address setup logic if we're coming from Stripe 
The code here runs from a callback which was originally designed to make sure the checkout page was set up correctly in the "normal" checkout workflow. It wasn't really designed to be run when the page is being loaded a second time due to the user being redirected back from Stripe (with SCA). The things it's doing here are necessary in the former case, but a really bad idea in the latter (potentially messing up the order's ship and bill addresses in certain cases like guest checkout).
 2021-11-14 16:54:44 +00:00
Matt-Yorkley
f83d0a766f Memoize Checkout#valid_payment_intent_provided? 2021-11-14 14:24:23 +00:00
Matt-Yorkley
bbb47964db Notify Bugsnag if the order loaded at checkout is invalid after being redirected back from Stripe during payment processing. 2021-11-14 13:58:15 +00:00
Matt-Yorkley
1bf4e6fa56 Reorder conditions for performance 
A little micro-optimisation: `@order.checkout_allowed?` requires a database query, whereas `@order.completed?` does not. So in cases where the order is completed we can return early here before hitting the database.
 2021-11-14 13:58:15 +00:00
Matt-Yorkley
8d0cbe886a Rename method for clarity 2021-11-14 13:58:15 +00:00
Matt-Yorkley
48acc0ecd0 Add Bugsnag notice when an OC closes during checkout completion 
This info could be useful to know whilst debugging order completion issues.
 2021-11-14 13:58:15 +00:00
Matt-Yorkley
d0f572b051 Remove dead code: session[:guest_token] 
This `session[:guest_token]` doesn't seem to ever be assigned anywhere in the codebase, and it doesn't seem to be read at any point either..? There are some various places where `current_order.token` is used and `session[:access_token]` is used, but not this.

As far as I can tell: it was part of an old version of Spree and related to the spree_auth_devise gem (which we no longer use).
 2021-11-14 12:02:07 +00:00
Matt-Yorkley
00862844d5 Memoize Checkout#valid_payment_intent_provided? 2021-11-14 11:39:36 +00:00
Matt-Yorkley
0683941f88 Ensure line items are correctly scoped for producers 2021-11-11 13:11:19 +00:00
Jean-Baptiste Bellet
7041ec71a4 Translate some error messages during payment processing if exists 
- Stripe error messages aren't translated. But, Stripe send the error code. Use it (if found it, and translation key does exist) to translated the error message
 - Populate the en.yml file with some of the most known errors

Co-Authored-By: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
 2021-11-11 12:04:38 +01:00
Matt-Yorkley
fa4751b998 Include items from resumed orders when mailing producers 2021-11-10 15:09:24 +00:00
Jean-Baptiste Bellet
d2dbe6c738 Use distinct to return unique product 
- Product were displayed twice (or more) in certain condition under order cycle incoming products admin interface
 2021-11-10 14:49:19 +01:00