raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-25 20:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,930 Commits 21 Branches 450 Tags
aa6a4925ac7b63d98b2afbc155c10d8a00a78fec
Commit Graph

2886 Commits

Author SHA1 Message Date
Matt-Yorkley
16c6155b14 Use old image tag in Angular template files 
Angular templates apparently don't work with Webpacker... :/
 2021-12-27 17:45:06 +00:00
Matt-Yorkley
f2fc100b5f Replace #image_path helper calls with #image_pack_path 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
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
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
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
fd94f26765 Merge pull request #8557 from Matt-Yorkley/card-brand-formatting 
Credit card brand formatting
 2021-12-15 20:18:21 +00:00
Sebastian Castro
18d966f0de Closes #8441 Confirmation popup on shop change 2021-12-08 13:34:15 +01: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
Matt-Yorkley
4cdb892c75 Refactor formatting of credit card brand names and reformat automatically when saving 
This little bit of "translation" between what we might receive as input and what ActiveMerchant requires is important, but currently the responsibility for this job is spread all over the code base. It can now just live in the CreditCard model (in one place) and doesn't need to be duplicated anywhere else (like several different places in frontend Javascript!)
 2021-12-02 16:22:52 +00:00
Jean-Baptiste Bellet
59eb91c7c8 Remove id "card-element" as well 2021-11-29 10:18:06 +01: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
3df304c9d6 Search and match through name + city and state_name 
- Rename enterpriseMatchesNameQueryFilter as well to enterpriseMatchesQueryFilter
 - Update tests as well
 2021-11-12 15:57:28 +01:00
Matt-Yorkley
8cb2a2cc96 Merge pull request #8451 from Matt-Yorkley/variant-search-debounce 
Fix debounce on variant search dropdown
 2021-11-05 18:59:44 +00:00
Maikel
a29330884c Merge pull request #8289 from jibees/7409-add-signup-matomo-event 
Track event via matomo when submitting signup form
 2021-11-05 11:05:45 +11:00
Maikel
3f571d178f Merge pull request #8418 from KombiCode/7706-add-close-button-to-flatpickr 
7706 add close button to flatpickr
 2021-11-05 11:04:50 +11:00
Matt-Yorkley
ce61b5088e Fix debounce on variant search dropdown 
This wasn't applied correctly so there was zero debounce, leading to a big excess of pointless requests whilst typing in the variant search dropdown
 2021-11-04 20:44:09 +00:00
Thierry Jet
5ebee9cd5f Translation stuff ready for Close button. Add close: key scoped spree.admin.date_picker in en.yml 2021-10-26 19:38:49 +02:00
Thierry Jet
47e9692226 Add a close button to datepicker. Close the popover when clicked. Not yet using translation 2021-10-26 14:36:16 +02:00
Thierry Jet
c45e120ff8 Add a close button to datetimepicker. Close the popover when clicked. Not yet using translation 2021-10-26 14:33:02 +02:00
GeorgeThoppil
2c596fb2dd Adding regex op on long_description 2021-10-23 14:45:49 -04:00
jibees
fa7c64841f Merge pull request #8286 from mkllnk/permalink-check 
Avoid superfluous permalink check on site load
 2021-10-22 09:14:41 +02:00
Jean-Baptiste Bellet
e7c04a2dd6 Track event on Signin/Signup Modal View 
Event Category: SignIn/Signup
Event Action: Modal View
Event Name: the current url
 2021-10-12 15:26:11 +02:00
Jean-Baptiste Bellet
9fcd6cd215 Track event on Login Submit Success 
Event Category: SignIn/Signup
Event Action: Login Submit Success
Event Name: the current url
 2021-10-12 15:26:11 +02:00
Jean-Baptiste Bellet
969a7ef2d0 Track event on Signup Submit Success 
Event Category: SignIn/Signup
Event Action: Signup Submit Success
Event Name: the current url
 2021-10-12 15:25:59 +02:00
Cillian O'Ruanaidh
2462d71ab5 When creating backoffice orders hide variants with no stock by default 
But let people include out of stock variants by checking a checkbox if they want.

Note, we only apply the variants in stock scope if a distributor is
present. I think this is because this search method is also used when
setting up subscriptions so I don't think we want to change the
behaviour there.

Co-authored-by: Maikel Linke <maikel@email.org.au>
 2021-10-08 13:13:32 +01:00
Nihal M. Kelanthodika
d85a109a21 Merge pull request #7973 from apricot12/HQ_address_in_business_details 2021-10-07 18:32:24 +05:30
Andy Brett
5da1c2f7bd Merge pull request #8288 from mkllnk/pending-changes 
Translate "Save Changes"
 2021-10-06 08:06:48 -07:00
Nihal
c120965a8d Fix translations 2021-10-06 15:06:56 +05:30
Nihal Mohammed
7ef6671e37 Add tooltip for business address 
Fix schema
 2021-10-06 15:06:56 +05:30
Matt-Yorkley
8393414bf5 Adapt admin enterprise form handling for both address and business_address 2021-10-06 15:06:56 +05:30
Maikel Linke
5b9d5a6bce Avoid console error by catching potential fails 2021-10-06 15:51:43 +11:00
Maikel Linke
129c4c92fa Catch JS error on OC page 
Calling `when variant.id in enterprise_rules` raised an error when
enterprise_rules was null.

Fixing this then revealed a missing require statement in a controller.
 2021-10-06 15:29:41 +11:00
Maikel Linke
e41a0504b7 Fix coffescript typo 2021-10-06 15:22:11 +11:00
Maikel Linke
75731ed546 Avoid superfluous permalink check on site load 2021-10-06 15:22:02 +11:00
Maikel
5b5693dc26 Merge pull request #8180 from jibees/7504-resolve-rounded-errors 
Avoid rounded with float numbers errors with javascript
 2021-09-23 09:56:03 +10:00
Maikel
a3c31f7d86 Revert "Kill stripe connect" 2021-09-20 08:39:34 +10:00
Matt-Yorkley
f4c86a1b51 Merge pull request #8061 from Matt-Yorkley/turbo-checkout 
Split Checkout new toys
 2021-09-17 10:48:59 +02:00
Andy Brett
f28200164b Merge pull request #8154 from meronokbay/8098-custom-modal-order-deletion 
Replaced the default alert and confirm modals in the order page by custom modals
 2021-09-15 09:22:58 -07:00
Jean-Baptiste Bellet
ba09618374 Avoid rounded with float numbers errors with javascript 
0.7/0.001 = 699.9999999999999

Use Math.round() to avoid this.
 2021-09-14 10:45:31 +02:00
Meron Ogbai
a065a92616 Reorganize alert and confirm code 2021-09-11 13:36:28 +03:00
Meron Ogbai
aed84912a3 Use selector to get del element 2021-09-11 13:10:33 +03:00
Luis Ramos
60a8ae6675 Remove Stripe Connect gateway and related code 2021-09-10 14:43:24 +05:30
Meron Ogbai
95e294c9ec Use custom modals for deleting orders 2021-09-09 06:25:03 +03:00
Matt-Yorkley
086c5ab264 Replace directive with data-confirm 2021-09-08 10:34:34 +01:00