Yasuhiro Yoshida
768acc4166
Add scope to only allow visible enterprises in group
2021-10-01 15:22:00 +03:00
Yasuhiro Yoshida
ace8c8768f
Remove ng-if to filter out invisible enterprises from group
2021-10-01 15:21:13 +03:00
Yasuhiro Yoshida
8090945c34
Change visibilities of hubs on group page
...
Issue:
https://github.com/openfoodfoundation/openfoodnetwork/issues/5106
Hubs on group page for consumers are displayed unconditionally.
But they should only appear under the following conditions: Visible.
In addition, those that are active should only be filled with red color
when they have open order cycles.
This commit apply these rules and changes the visibility of each hub on
"Our Hubs" tab of group page for consumers accordingly.
2021-09-17 17:12:08 +03:00
Luis Ramos
60a8ae6675
Remove Stripe Connect gateway and related code
2021-09-10 14:43:24 +05:30
Maikel
9affc6a945
Merge pull request #8108 from Matt-Yorkley/andand
...
Remove `andand` gem
2021-09-10 15:06:00 +10:00
Maikel Linke
e013d81e3d
Simplify safe navigation operator use < and []
2021-09-10 14:40:46 +10:00
Andy Brett
069cb043ee
Merge pull request #8148 from jibees/5236-remove-incomplete-orders-from-admin-interface-2
...
Only shows order that actually have at least one line_item V2
2021-09-09 16:49:30 -07:00
Andy Brett
392ba6f3d1
Merge pull request #7975 from vishaldeepak/mail-customer-information
...
Add customer information to mail when we notify producers when required
2021-09-09 16:10:46 -07:00
Andy Brett
9124e03c11
Merge pull request #8144 from meronokbay/6942-fix-payment-method-fee-bug
...
6942 fix payment method fee bug
2021-09-09 09:28:40 -07:00
Matt-Yorkley
b352476301
Update app/models/proxy_order.rb
...
Co-authored-by: Maikel <maikel@email.org.au >
2021-09-09 13:39:08 +02:00
Andy Brett
f8486bcbf8
Merge pull request #7769 from Matt-Yorkley/payment-status-checking
...
Stripe: payment status debugging
2021-09-08 15:21:38 -07:00
Andy Brett
afa1861181
pass payment to Stripe Validator instead of the status object
2021-09-08 12:26:56 -07:00
Andy Brett
de29d7e7d7
Merge pull request #8125 from jibees/5782-add-i18n-for-devise
...
Add devise-i18n and handle i18nization for devise controllers
2021-09-08 11:48:12 -07:00
Matt-Yorkley
48d4341e2d
Merge pull request #8112 from cillian/eager-load-permissions-with-enterprise-relationships
...
Eager load the EnterpriseRelationship :permissions association on the enterprise permissions page
2021-09-08 19:46:14 +02:00
Matt-Yorkley
1d5077061e
Remove andand
...
This old gem implemented some functionality for handling nils which is no longer needed, as it's provided natively by Ruby with the &. operator.
2021-09-08 14:28:31 +01:00
Matt-Yorkley
b53371d870
Fix not_empty scope
2021-09-08 12:14:53 +01:00
Jean-Baptiste Bellet
0ec35b1f0d
Only shows order that actually have at least one line_item
...
Filter inside the API to shows only orders that have at least one line items
2021-09-07 17:25:46 +02:00
Matt-Yorkley
b4278aabbf
Merge branch 'master' into 8009-handling-shipping-adress
2021-09-07 09:44:49 +02:00
Matt-Yorkley
3bcfc673f7
Ensure selected shipping method is actually selected
...
Hashes with symbol keys != hashes with string keys 🙈
2021-09-06 20:58:22 +01:00
Matt-Yorkley
fb7a3a681b
Validate attributes per checkout step and decouple order-advancing
2021-09-06 14:25:16 +01:00
Matt-Yorkley
71412f8d4b
Update validations
2021-09-06 14:22:28 +01:00
Matt-Yorkley
c3b52ef00a
Remove payments validation
2021-09-06 14:19:35 +01:00
Matt-Yorkley
cfee804339
Improve concern loading
...
It shouldn't need `require` or `prepend`
2021-09-06 14:19:13 +01:00
Matt-Yorkley
e3e53b1504
Ensure feature toggle works for non-logged-in users
2021-09-05 22:39:47 +01:00
Matt-Yorkley
70513ae989
Don't transition to address before page load
2021-09-05 20:19:22 +01:00
Meron Ogbai
5ca552d380
Show flash error if preferred amount isn't valid
2021-09-05 01:11:12 +03:00
Matt-Yorkley
fe99a5cc55
Merge pull request #8129 from Matt-Yorkley/searchable
...
Searchable attributes
2021-09-03 09:43:25 +02:00
Matt-Yorkley
fbdc38b6c4
Merge pull request #8111 from jibees/4582-remove-units-on-quantity-column-
...
Display variant quantity on the quantity column on the edit order page in backoffice
2021-09-02 20:45:22 +02:00
vishaldeepak
b13b2b9b95
Customer Information on mail show be displayed depending on order cycle coordinator's customer names flag
2021-09-02 18:59:28 +05:30
Matt-Yorkley
3fc0278776
Whitelist searchable attributes on primary models
2021-09-02 14:06:15 +01:00
Matt-Yorkley
b25759670e
Implement ransackable whitelisting
2021-09-02 13:43:22 +01:00
Jean-Baptiste Bellet
97fd7e3d78
Improve look and feel by adding some responsive margins
2021-09-01 17:16:30 +02:00
Matt-Yorkley
9d6e5e9420
Remove currently unused code
2021-09-01 15:04:53 +01:00
Matt-Yorkley
1fca7d2a6c
Remove error-clearing from edit action
2021-09-01 15:04:53 +01:00
Matt-Yorkley
4cff185b4b
Extract params handling to service
2021-09-01 15:04:53 +01:00
Matt-Yorkley
57504f42d8
Move validations to state transitions
2021-09-01 15:04:53 +01:00
Matt-Yorkley
6acb1f6484
Tidy up view variables
2021-09-01 15:04:33 +01:00
Matt-Yorkley
9800483433
Simplify displaying selected shipping method
2021-09-01 15:04:33 +01:00
Matt-Yorkley
b7e1882bd8
Simplify setting address params
2021-09-01 15:04:33 +01:00
Matt-Yorkley
3fabe308cd
Extract #shipping_and_billing_match? helper
2021-09-01 15:04:33 +01:00
Matt-Yorkley
ac4d721de0
Extract #set_payment_amount method
2021-09-01 15:04:33 +01:00
Matt-Yorkley
2786fb30ba
Simplify order advancing process
2021-09-01 15:04:33 +01:00
Matt-Yorkley
978c882ed9
Don't select a random shipping method in Shipment
2021-09-01 15:04:33 +01:00
Matt-Yorkley
3dd8ed85b4
Implement manual shipping method selection
2021-09-01 14:16:32 +01:00
Matt-Yorkley
ebe2923512
Improve form outputs and error handling
2021-09-01 14:16:32 +01:00
Andy Brett
fba7699d0b
select shipping method when advancing to payment
2021-08-31 11:00:54 +02:00
Jean-Baptiste Bellet
a1438f91e9
Display error on email (triggered by advance_order_state method)
2021-08-31 11:00:54 +02:00
Andy Brett
69ec17ef92
do not require phone number on orders
2021-08-31 10:59:13 +02:00
Andy Brett
ca7da94fd8
Merge pull request #8088 from jibees/8087-select-unselect-orders-in-admin
...
Handle select/unselect all orders in the admin orders page
2021-08-28 11:34:20 -07:00
Jean-Baptiste Bellet
5c05be22f5
As it is a quantity column, display variant quantity
...
(this column was confused, and was understood like a simply quantity column not the item quantity separated according to its "state")
Update specs as well
2021-08-27 15:15:14 +02:00
