raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-04 22:16:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,931 Commits 18 Branches 452 Tags
a71bb217890cffa2d313bebf4940e172ef907d97
Commit Graph

10645 Commits

Author SHA1 Message Date
Konrad
4973b5c07c Merge pull request #11789 from duleorlovic/11784_contact_tab 
Fix open Contact tab from "customers only" message
 2023-12-19 15:05:41 +01:00
Maikel
080086aa38 Merge pull request #11943 from openfoodfoundation/dependabot/bundler/stripe-10.3.0 
Bump stripe from 10.2.0 to 10.3.0
 2023-12-18 14:46:40 +11:00
Maikel Linke
317d492873 Test Stripe with real API 2023-12-18 14:06:38 +11:00
Dusan Orlovic
120e299653 Use activate instead of changeActivePanel/ChangeActiveTab 
Remove shop-tabs controllers since we can listen on `"data-action":
"orderCycleSelected@window->tabs-and-panels#activateDefaultPanel"`

Test for cases:
* activate by clicking on tab
* activateDefaultPanel on orderCycleSelected event
* activateFromWindowLocationOrDefaultPanelTarget to activate tab based
  on achor in URL
 2023-12-16 10:00:17 +01:00
Maikel Linke
1d7f96e965 Broadcast connected app to all user tabs 2023-12-15 12:34:40 +11:00
Maikel Linke
e1730f25d6 Show app connection state and update link 2023-12-15 12:34:40 +11:00
Maikel Linke
12e5a0d1e1 Query webhook to connect app 2023-12-15 11:50:04 +11:00
Maikel Linke
4eb273b06e Create ConnectedApp with a reflex 
I would have like to use a standard form to submit to the reflex but the
whole enterprise settings tab is in a form already and HTML doesn't
allow nested forms. While it does still work in browsers, it would have
added much more HTML to set up a form with a hidden input field instead
of just one additional data attribute.

The whole page is rendered by the controller again but the reflex root
attribute ensures that only parts of this tab are replaced. Otherwise
unsaved data on other tabs could be replaced and the page actually
becomes blank because AngularJS doesn't play well with the morph.
 2023-12-15 11:50:04 +11:00
Maikel Linke
2346f03b6f Add ConnectedApp model 2023-12-15 11:50:04 +11:00
Maikel Linke
ca7b02d3ee Add basic description of Discover Regen app 2023-12-15 11:50:04 +11:00
Maikel Linke
d4ce3965b1 Connected apps can be enabled per user or enterprise 2023-12-15 11:22:15 +11:00
Maikel Linke
af2b65256f Add new enterprise settings tab Connected Apps 2023-12-15 11:22:15 +11:00
Mohamed ABDELLANI
2b1d7923da remove ':' after the shipping category on the invoice template 2023-12-14 16:42:24 +01:00
Mohamed ABDELLANI
db653fc945 render the shipping category in the invoice. 2023-12-14 16:36:36 +01:00
Rachel Arnould
9d87449730 Merge pull request #11704 from abdellani/add-reference-to-previous-invoices 
a new invoice should refer the latest invoice.
 2023-12-14 16:05:08 +01:00
Rachel Arnould
329ad1ddb2 Merge pull request #11874 from dacook/buu-success-message-11517 
[BUU] Flash message redesign
 2023-12-13 11:59:19 +01:00
filipefurtad0
0f41d900df DRYes card and payment intent let groups 
Fixes typo on capture_amount declaration
 2023-12-12 13:18:17 +00:00
filipefurtad0
b45fc0b7ef Replaces Stripe Stubs with VCR calls 
Adds new VCR cassettes

Keeps assertion on ActiverMerchant response

Re-records cassettes
 2023-12-11 21:52:37 +00:00
Mohamed ABDELLANI
915afd8557 update the invoice v3 template 2023-12-11 08:26:32 +01:00
Mohamed ABDELLANI
615c001c28 implement Invoice#previous_invoice 2023-12-11 08:26:32 +01:00
Konrad
5aaaef63ac Merge pull request #11911 from arunguleria/11599-checkout-page-title-changes 
Change page title on checkout pages
 2023-12-10 20:53:56 +01:00
Konrad
cdb7312e95 Merge pull request #11798 from cillian/conditional-supplier-column-in-order-cycle-report 
Only display Supplier column in Order Cycle Report email if there is more than one supplier
 2023-12-10 16:49:23 +01:00
Mohamed ABDELLANI
4a22224c73 fix existing tests 2023-12-08 13:33:36 +01:00
Maikel Linke
29ef444f36 Consolidate system specs for efficiency 
And test for literal strings. It's more readable and robust.
 2023-12-08 09:05:00 +05:30
Maikel Linke
f88a3122ee Fix expectation of checkout title 2023-12-08 09:05:00 +05:30
Arun Guleria
4e408d404b 11599-Change page title on checkout pages 2023-12-08 09:05:00 +05:30
Maikel
fe4380a84a Merge pull request #11900 from filipefurtad0/valid_cards_extend_payment_intents_tests 
Adds payment intent creation/capture tests for valid credid card types (non-3D)
 2023-12-08 09:04:56 +11:00
filipefurtad0
3802447bfe Removes credit card mock, pointing to real Stripe object 
Re-records cassettes after source change
 2023-12-07 18:30:23 +00:00
Maikel
7bc1442b5b Merge pull request #11899 from filipefurtad0/system_spec_zero_priced_variant 
Adds test cases to account for priceless and 0.0 priced variant creation
 2023-12-07 07:53:42 +11:00
Konrad
7efc6f35b2 Merge pull request #11891 from bmd08a1/ft/search-by-customer-fullname-with-comma 
Allow searching orders by customers' full name with comma and full name reversed
 2023-12-06 21:08:28 +01:00
Konrad
7c892b2e9e Merge pull request #11889 from cillian/split-checkout-to-just-checkout 
Replace references to 'split checkout' with just 'checkout'
 2023-12-06 20:42:26 +01:00
Konrad
dc4b6519dd Merge pull request #11885 from dacook/flash-messages 
Fix mapping of flash messages on order cycle pages
 2023-12-06 18:03:57 +01:00
David Cook
0f3a952fd0 Add translation for product cloned message 
A validation error shouldn't happen. If it does, it's an exception, not an error.
 2023-12-06 15:13:20 +11:00
David Cook
0b4013dd11 Add dismiss button to flashes 
And updating the secondary button style to ensure it's always white background
 2023-12-06 10:12:17 +11:00
David Cook
6dc04c458c Show saving success message in flash 
I don't know if this is the best way to do it with SR, but it works..
 2023-12-06 10:12:17 +11:00
David Cook
70f153b0f7 Refactor spec 
Only the first example is testing the updated variant here.
 2023-12-06 10:11:19 +11:00
David Cook
7d299affd3 Move hiding logic to stimulus controller 
This ensures morphed flashes hide like other flashes (eg in bulk order actions). I wanted to write a spec to prove it, but Capybara doesn't support mocking setTimeout and I didn't want to use sleep.

I've made it optional because this controller is shared with the shop frontend ([supposedly](5ef34347a3), although angular seems to override it).
 2023-12-06 10:11:19 +11:00
filipefurtad0
e50baa9a18 Adds payment capture scenario 2023-12-05 15:27:46 +00:00
David Cook
300998acb6 Merge pull request #11811 from dacook/buu-stock-levels-11062 
[BUU] Stock level popout
 2023-12-05 13:56:01 +11:00
David Cook
685a1955bc Merge pull request #11872 from mkllnk/activate-background-reports 
Activate background report processing by default
 2023-12-05 12:04:19 +11:00
filipefurtad0
f3f59ed6ad Adds valid credid card types (non-3D) 2023-12-04 20:48:53 +00:00
filipefurtad0
7aeb6e4cd9 Adds test cases to account for priceless and 0.0 priced variant creation 2023-12-04 18:40:55 +00:00
Maikel
cb5164ac6e Merge pull request #11888 from openfoodfoundation/dependabot/bundler/stripe-10.2.0 
bump stripe from 10.1.0 to 10.2.0
 2023-12-04 14:54:38 +11:00
Dung Bui
8a3aababa1 group specs into one it block, added fullname with comma reversed ransacker 2023-12-04 08:45:19 +07:00
Maikel Linke
48c6d0144d Update stripe tests 2023-12-04 10:58:10 +11:00
Gaetan Craig-Riou
55d64e1768 Fix rubocop warning 2023-12-04 10:36:53 +11:00
Dung Bui
6206164c30 fix rubocop 2023-12-03 14:28:50 +07:00
Dung Bui
600226cb52 add fullname reversed search 2023-12-03 14:15:41 +07:00
Dung Bui
febda2ce12 add search by fullname with comma 2023-12-03 14:10:12 +07:00
Cillian O'Ruanaidh
2f972a5446 Remove more references to split checkout in test descriptions 2023-12-01 13:04:49 +00:00