Nihal Mohammed
15e7a5a4df
Rename product_stock_display to product_low_stock_display
...
Rename product_stock_display to product_low_stock_display in enterprise_serializer and shop_variant_controller
2022-04-15 10:59:42 +10:00
Nihal M. Kelanthodika
f7a767988c
Add preferred_product_stock_display to Enterprise model, serializer and permitted attributes. (Fixed alignment of guest orders radio button as well)
2022-04-15 10:53:28 +10:00
Maikel
a4bffc61f1
Merge pull request #8997 from apricot12/8968-Group-products-by-supplier-P1
...
Sort products by supplier in invoice
2022-04-13 11:54:12 +10:00
Nihal Mohammed
992cb9d920
Add invoice_order_by_supplier attribute to enterprise
2022-03-21 20:29:19 +05:30
Jean-Baptiste Bellet
440e5aaf97
Default checked/unchecked values for checkbox is 0/1
2022-03-07 17:41:05 +01:00
Jean-Baptiste Bellet
405b7e6e17
Handle tax rates for ShippingMethod
...
Co-Authored-By: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com >
2022-02-15 15:16:58 +01:00
Filipe
75395f6f29
Merge pull request #8648 from Matt-Yorkley/csp
...
Configure CSP
2022-01-26 19:55:11 +00:00
Filipe
374c05116b
Merge pull request #8726 from Matt-Yorkley/stringex-machina
...
Reduce impact of stringex gem
2022-01-26 19:02:41 +00:00
Matt-Yorkley
b5a1d9ebef
Allow using saved cards at checkout
2022-01-24 23:06:43 +00:00
Matt-Yorkley
8552da2377
Extract and stub PaymentMethodFetcher
2022-01-24 20:28:59 +00:00
Matt-Yorkley
2b960a04c6
Move Order callback entirely into service
2022-01-19 13:40:33 +00:00
Matt-Yorkley
8a944e3e78
Tidy up Order#save_default_addresses
2022-01-19 13:40:33 +00:00
Matt-Yorkley
8f37aa71f2
Save default addresses when requested during checkout
2022-01-19 13:40:33 +00:00
Matt-Yorkley
fb00a51ae8
Merge pull request #8653 from Matt-Yorkley/split-checkout-t-and-c
...
Split checkout T&Cs
2022-01-19 13:39:15 +00:00
Matt-Yorkley
dfbd384c95
Refactor embedding to a Concern
2022-01-18 12:22:06 +00:00
Matt-Yorkley
4649698fc4
Remove #set_response_headers
2022-01-18 12:19:54 +00:00
Matt-Yorkley
0ef35b319c
Create UrlGenerator service
2022-01-15 13:21:09 +00:00
Matt-Yorkley
3f3bfadb59
Simplify StripeScaPaymentAuthorize and clarify both return URL types (checkout and off-session)
2022-01-14 19:41:08 +00:00
Matt-Yorkley
76647863e8
Add new Stripe controller
2022-01-14 19:41:08 +00:00
Matt-Yorkley
02995530e2
Pull apart OrderCompletionReset service
2022-01-14 19:41:08 +00:00
Matt-Yorkley
67b8a55273
Separate OrderCompletionReset from Checkout::PostCheckoutActions and don't pass controller objects to Checkout::PostCheckoutActions
...
We need to separate some of these bits to make them easier to call in different contexts. Also there's some weird stuff happening here with the controller being passed in to the service, and it seems like a code smell to me...
2022-01-14 19:41:08 +00:00
Matt-Yorkley
18cdf98aa1
Set terms and conditions accepted when completing checkout
2022-01-12 22:17:22 +00:00
Matt-Yorkley
58d3ad412a
Rename method for clarity
2022-01-12 17:52:10 +00:00
Matt-Yorkley
cb5dd6eed9
Move T&C checks to service
2022-01-12 17:52:10 +00:00
Filipe
da703b2d95
Merge pull request #8615 from jibees/8559-enable-sort-orders-by-order-full-name
...
Enable sorting orders by order full name
2022-01-11 11:27:36 +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
Sebastian Castro
95ff3d7a11
Add automatic_notification field in advanced settings
2021-12-23 20:41:49 +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
35e20fc179
Can sort orders via bill_address.lastname
...
We only need to check the orders sort
Fix ordering in api/v0/orders_controller_spec
2021-12-16 09:33:38 +01:00
Matt-Yorkley
b77ff346a3
Replace #raise with #return in Checkout::StripeRedirect
...
The (potential) unhappy code path here was raising an error which would not be explicitly handled, and would in theory not return a useful message / response.
2021-12-15 21:20:58 +00:00
Matt-Yorkley
0fc4b851f2
Refactor payment gateway redirects handling
...
The checkout was holding a lot of responsibility for knowing which kinds of payment gateways are available and how to initiate the process of redirecting to the external payment page (if needed). This was being hidden somewhat by the way the logic was tucked away in services.
PaymentMethod objects now know whether or not they require an external payment process, and know how that process should be started and how to build the required URL.
So we can now *ask* any payment method if it requires external payment processing or not, and *tell* it to start the process and return the relevant URL (if needed).
2021-12-15 21:20:58 +00:00
Filipe
f6385215d3
Merge pull request #8568 from Matt-Yorkley/paypal-controller
...
Move paypal controller
2021-12-15 18:12:27 +00: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
Matt-Yorkley
f101b06226
Update all references to paypal routes
2021-12-10 11:46:53 +00:00
Matt-Yorkley
6b8c91845e
Update strong params
2021-12-07 16:29:25 +00:00
Matt-Yorkley
290e292dea
Revert "Fixed inconsistency with display of unit name for products sold by item"
2021-12-07 13:24:12 +00:00
Nihal M. Kelanthodika
74b87adee3
Merge pull request #8500 from apricot12/8495-Variant-unit-name-shopfront
2021-11-25 16:06:06 +05:30
Nihal M. Kelanthodika
8a42043701
Fixed inconsistency with display of unit name for products sold by item
2021-11-19 13:39:42 +05:30
Matt-Yorkley
0683941f88
Ensure line items are correctly scoped for producers
2021-11-11 13:11:19 +00:00
Matt-Yorkley
cf5d964133
Update usages of old preference getters and setters
2021-11-04 11:48:30 +00:00
Maikel
1b79fdd333
Merge pull request #8409 from luisAzcuaga/task/rubocop
...
[6055] Task: Run rubocop over existing todo
2021-10-29 12:01:12 +11:00
Luis Azcuaga
e8fd89a6d2
Run rubocop over existing todo
2021-10-25 21:28:28 -05:00
PHAN QUANG LAM
77524c633d
Fix menu indicator on bulk order page
2021-10-26 06:41:30 +09:00
Nihal M. Kelanthodika
c6219a47c3
Remove stray space
2021-10-06 15:06:56 +05:30
Nihal Mohammed
1c72cd799d
Permit :id attribute in PermittedAttributes:BusinessAddress
2021-10-06 15:06:56 +05:30
Nihal Mohammed
3cd5ed58c0
Add checkbox to clear business_address form
2021-10-06 15:06:56 +05:30
Nihal Mohammed
26c7cb2bd3
Fix business_address attribute permissions
2021-10-06 15:06:56 +05:30
Nihal Mohammed
783b055d55
Add business address permitted attributes
2021-10-06 15:06:20 +05:30
Jean-Baptiste Bellet
78bbee49e9
Search for orders that are finalized
...
Thus, we display the orders that contains at least one line item (whatever its state) + the finalized orders
NB // Finalized state : complete canceled resumed awaiting_return returned
2021-09-23 11:06:15 +02:00