raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-21 00:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,896 Commits 18 Branches 454 Tags
aaf5d1ba380a6feba47c8d9a906ee90d00539cc8
Commit Graph

22896 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt-Yorkley
aaf5d1ba38 Patch CanCan deprecated keyword arguments 
Solves an issue with use of deprecated positional args. The version of CanCan which fixes this is not currently compatible with OFN...
 2021-12-27 16:27:04 +00:00
Matt-Yorkley
4dc2172dd2 Update deprecated #search method name 
DEPRECATION WARNING: #search is deprecated and will be removed in 2.3, please use #ransack instead (called from search at /home/user/Github/openfoodnetwork/lib/open_food_network/sales_tax_report.rb:40)
 2021-12-27 16:24:33 +00:00
Matt-Yorkley
482879245f Merge pull request #8632 from Matt-Yorkley/default-url-options 
Set default_url_options in all environments
 2021-12-27 12:23:49 +00:00
Matt-Yorkley
15c59d1a93 Merge pull request #8647 from Matt-Yorkley/test-suite-issues 
Fix infinite loop in datepicker selection logic
 2021-12-27 12:19:56 +00:00
Matt-Yorkley
c046f72ca8 Fix infinite loop in datepicker selection logic 2021-12-27 11:17:33 +00:00
Matt-Yorkley
5b5a9ad750 Set default_url_options explicitly in all environments 2021-12-25 13:27:16 +00:00
Matt-Yorkley
b813acdab3 Tidy up (consolidate) setting of the "domain" in dev and test environments 2021-12-25 13:27:16 +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
e1664c173a Merge pull request #8622 from openfoodfoundation/transifex 
Transifex
 2021-12-23 21:34:55 +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
Filipe
a3f3d8f96f Merge pull request #8598 from seballot/oc-notify-producers 
Configuration to automatically notify producers on order cycle close
 2021-12-23 21:31:45 +00:00
Matt-Yorkley
860c2ba03c Update spec/models/order_cycle_spec.rb 2021-12-23 20:41:49 +01: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
492325b74a Add automatic_notifications column to order_cycles table 2021-12-23 20:41:49 +01:00
Matt-Yorkley
e78cea457c Add :unprocessed scope to OrderCycle 2021-12-23 20:41:42 +01:00
Matt-Yorkley
17a112907c Add processed_at column to order_cycles table 2021-12-23 20:41:42 +01:00
Filipe
b786d89fe9 Merge pull request #8555 from jibees/8507-fix-product-search-order- 
Searching variants should order results by variant display name
 2021-12-23 17:41:01 +00: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
Maikel
aae873df9d Merge pull request #8639 from filipefurtad0/sitemap_spec_into_syste 
Updates/moves sitemap_spec
 2021-12-22 16:16:09 +11: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
filipefurtad0
b79ae1af7a Fixes rubocop offense 2021-12-21 10:51:20 +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
filipefurtad0
b25e0ed87b Deletes spec/features/consumer folder 2021-12-20 15:13:57 +00:00
filipefurtad0
c5b14827d0 Adds URL port to the assertion 2021-12-20 14:54:03 +00:00
filipefurtad0
eef89e73c8 Updates/moves sitemap_spec 2021-12-20 14:49:05 +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