Commit Graph

13873 Commits

Author SHA1 Message Date
Matt-Yorkley
28f9f4245d Fix deprecated syntax using @extend with :before
This is no longer valid scss
2021-12-27 17:45:06 +00:00
Matt-Yorkley
6f06205eed Switch admin CSS to webpack 2021-12-27 17:45:06 +00:00
Matt-Yorkley
ba583dcf39 Install jquery-ui via yarn
We can delete the gem once the Javascript part has been handled
2021-12-27 17:45:06 +00:00
Matt-Yorkley
9d18f318ac Remove Sprockets includes in admin scss 2021-12-27 17:45:06 +00:00
Matt-Yorkley
b33ac49442 Update vendor import paths 2021-12-27 17:45:06 +00:00
Matt-Yorkley
0057dbcb89 Remove Sprockets require statements 2021-12-27 17:45:06 +00:00
Matt-Yorkley
2e194ac312 Switch to npm-based Foundation javascript 2021-12-27 17:45:06 +00:00
Matt-Yorkley
ec2213d2f0 Reduce duplicate import statements
It looks ike these CSS rules are actually being re-imported multiple times, which is bloating the output.
2021-12-27 17:45:06 +00:00
Matt-Yorkley
825aeeae04 Migrate images and update assets 2021-12-27 17:45:06 +00:00
Matt-Yorkley
cb27081425 Install Foundation 5.5.2 via yarn 2021-12-27 17:45:05 +00:00
Matt-Yorkley
8dfc30438b Move CSS to Webpacker 2021-12-27 17:45:05 +00:00
Filipe
750411fd15 Merge pull request #8592 from openfoodfoundation/gateway-redirects
Refactor payment gateway redirects handling
2021-12-23 21:35:45 +00:00
Filipe
20c0195584 Merge pull request #8017 from cillian/hide-variants-with-no-stock
When creating backoffice orders hide variants with no stock by default
2021-12-23 21:34:06 +00:00
Filipe
b256696544 Merge pull request #8549 from mkllnk/deprecate-stripe-connect
Hide old "Stripe" (StripeConnect) payment method type, keep new Stripe SCA
2021-12-23 21:33:42 +00:00
Filipe
7560b4e056 Merge pull request #8482 from jibees/6689-search-city-and-state-name
Search enterprises through name + city and state_name
2021-12-23 21:33:06 +00:00
Sebastian Castro
708d40ac67 reset_processed_at adds guard clause 2021-12-23 20:41:49 +01:00
Sebastian Castro
ed64b6176f OC will renotify automatically if closing date change 2021-12-23 20:41:49 +01:00
Sebastian Castro
b76defc602 Improve notify producer button
Add icon
Better confirmation message
Adds tooltip
Adds small icon and change text if already notified
2021-12-23 20:41:49 +01:00
Sebastian Castro
d18b482b4c Move button rules into dedicate file 2021-12-23 20:41:49 +01:00
Sebastian Castro
eb6797220f Lift order cycle advanced settings UI 2021-12-23 20:41:49 +01:00
Sebastian Castro
95ff3d7a11 Add automatic_notification field in advanced settings 2021-12-23 20:41:49 +01:00
Matt-Yorkley
887879f410 Create job for handling of closing order cycles 2021-12-23 20:41:49 +01:00
Matt-Yorkley
e78cea457c Add :unprocessed scope to OrderCycle 2021-12-23 20:41:42 +01:00
Jean-Baptiste Bellet
f121704dd5 "Save card for future use" checkbox is part of the stripelements
... and should be hidden is the end-user select an existing card
2021-12-23 14:25:24 +01:00
Filipe
24301000bf Merge pull request #8631 from jibees/8625-step2-submit-errors
SplitCheckout - Handle submit on step2
2021-12-22 18:30:10 +00:00
Matt-Yorkley
570eb21469 Merge pull request #8638 from cillian/store-payment-captured-at
Add a :captured_at column on payments to store when they are captured
2021-12-22 15:21:55 +00:00
Filipe
4001fa985b Merge pull request #8612 from Matt-Yorkley/packing-reports-filtering
Packing reports filtering
2021-12-22 13:03:17 +00:00
Matt-Yorkley
f0d54dd083 Tidy up #redirect_to_payment_gateway 2021-12-22 09:58:08 +00:00
jibees
2a0b7df7f4 clearer intention
- it uses simple index_by and map which is easier to understand than each_with_index.to_h
- it avoids sorting and therefore should be the most efficient solution.

Co-authored-by: Maikel <maikel@email.org.au>
2021-12-22 10:03:34 +01:00
Filipe
1cee7b6f17 Merge pull request #8614 from mkllnk/8606-subs-dups
Synchronise processing of subscriptions and avoid duplicate order creation
2021-12-21 16:57:46 +00:00
Matt-Yorkley
8016e90e07 Ensure payment method is actually selected 2021-12-20 18:47:22 +00:00
Matt-Yorkley
dd23e3d38a Simplify payment method controller 2021-12-20 18:47:22 +00:00
Matt-Yorkley
b4dab46cf8 Remove unused code for changing required attributes 2021-12-20 18:36:28 +00:00
Matt-Yorkley
723d6489cd Extract initSelectedCard() 2021-12-20 18:36:26 +00:00
Matt-Yorkley
9525e353a3 Don't try to select a card if there is no select element
This error was being thrown when the user had no cards saved:
```
TypeError: stripeCardsController is null
```
2021-12-20 18:36:09 +00:00
Matt-Yorkley
a64f654697 Don't try to select a card if there is no selectTarget
This error was being thrown when the user had no cards saved:
```
Error: Missing target element "stripe-cards.select"
```
2021-12-20 15:41:22 +00:00
Matt-Yorkley
f18fc3c2f3 Implement disconnect() to tidy up (remove) event listeners from the DOM when finished 2021-12-20 15:29:52 +00:00
Matt-Yorkley
d58f5aa25d Move initialization to initialize() 2021-12-20 15:29:52 +00:00
Matt-Yorkley
33c156bb55 Extract (arrow) functions for callbacks used by event listeners and reduce variable assignments 2021-12-20 15:29:52 +00:00
Matt-Yorkley
24c051bad3 Simplify stripe selected check 2021-12-20 15:21:13 +00:00
Jean-Baptiste Bellet
ad24351bb3 Reorganize CSS to display error correctly
`.card-errors` is no more child of `.stripe-card`
2021-12-20 15:34:58 +01:00
Jean-Baptiste Bellet
2c5667ef56 Initialize stripe-cards controller when selecting a payment method 2021-12-20 15:34:58 +01:00
Jean-Baptiste Bellet
d4ec075dfc Disabled stripe-cards input if a already registred card is select
And then re-enabled it, if use decide to register a new card
2021-12-20 15:34:58 +01:00
Jean-Baptiste Bellet
7b6aa99de2 Handle when input is already checked
ie. user hasn't click on anything
2021-12-20 15:34:58 +01:00
Jean-Baptiste Bellet
6ef7256295 Only submit handle form submit if stripeElementsForm is visible 2021-12-20 15:34:58 +01:00
Maikel Linke
6d1e984af7 Enable testers to activate StripeConnect
This will make it easier to test the removal of StripeConnect.
2021-12-20 17:16:39 +11:00
Maikel Linke
470fc92825 Fix old, confusing typo 2021-12-20 17:13:40 +11:00
Maikel Linke
22de357724 Hide deprecated StripeConnect payment gateway
StripeConnect has been replaced by StripeSCA but some people still use
the old StripeConnect. Let's prevent people from creating deprecated
payment methods before migrating existing data.
2021-12-20 17:12:19 +11:00
Maikel Linke
6966dea0f5 Extract changing Stripe method selection logic
It will change and it's clearer in a separate method.
2021-12-20 17:09:57 +11:00
Maikel Linke
60adaf3646 Disallow StripeConnect in subscriptions 2021-12-20 15:00:14 +11:00