raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-17 04:34:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,860 Commits 15 Branches 457 Tags
b76defc602ca04b1430a6c3b2c2d126bb39a8fc9
Commit Graph

22860 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Cillian O'Ruanaidh
84eaafb822 Add a :captured_at column on payments to store when they are captured 
Fixes #8611.
 2021-12-17 14:45:47 +00:00
Filipe
e036e9b979 Merge pull request #8591 from filipefurtad0/consumer_specs_into_system 
Consumer specs into system
 2021-12-17 13:52:28 +00:00
Filipe
0cc7bdeafa Merge pull request #8521 from seballot/confirm-hub-change 
Confirmation popup on shop change in admin section.
 2021-12-17 10:56:37 +00:00
Filipe
cd70ce95a6 Merge pull request #8594 from seballot/products-index 
Hide loading html components on product index
 2021-12-17 09:36:54 +00:00
Filipe
e1bd2fc695 Merge pull request #8600 from seballot/shop-filters 
Make the shop filter section always visible when scrolling
 2021-12-17 09:31:51 +00:00
Filipe
e85101e5ff Merge pull request #8599 from seballot/select 
Style all standard select as the text input in the backoffice
 2021-12-17 09:25:43 +00:00
Filipe
fd94f26765 Merge pull request #8557 from Matt-Yorkley/card-brand-formatting 
Credit card brand formatting
 2021-12-15 20:18:21 +00:00
Filipe
f6385215d3 Merge pull request #8568 from Matt-Yorkley/paypal-controller 
Move paypal controller
 2021-12-15 18:12:27 +00:00
Filipe
c4f4d67fc0 Merge pull request #8503 from jibees/split-checkout-payment-forms 
Split checkout payment forms
 2021-12-15 12:57:03 +00:00
Jean-Baptiste Bellet
a33ebbdc85 Include and joins after the order seems in order to select fields... 
...that are in the order by
 2021-12-15 10:11:51 +01:00
Maikel Linke
0cc4e5728e Reference product attributes for sorting correctly 
The previous version failed in some cases as it relied on a table name
generated by Rails.
 2021-12-15 15:23:52 +11:00
Matt-Yorkley
6bbcec1186 Merge pull request #8617 from openfoodfoundation/dependabot/npm_and_yarn/jest-27.4.5 
Bump jest from 27.4.4 to 27.4.5
 2021-12-14 11:55:46 +00:00
dependabot[bot]
d945c64248 Bump jest from 27.4.4 to 27.4.5 
Bumps [jest](https://github.com/facebook/jest) from 27.4.4 to 27.4.5.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v27.4.4...v27.4.5)

---
updated-dependencies:
- dependency-name: jest
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-12-14 09:06:31 +00:00
Maikel Linke
bc50a01953 Ensure deterministic query to avoid deadlocks 2021-12-14 11:33:16 +11:00
Maikel Linke
9b6c9bd773 Synchronise processing of proxy orders 2021-12-14 11:33:16 +11:00
Maikel Linke
ce0913758b Bring initial proxy order processing closer 
We want to make it one transaction soon.
 2021-12-14 11:33:16 +11:00
Maikel Linke
7fdc2fdea2 Spec duplicate subscription order issue #8606 2021-12-14 11:33:16 +11:00