Matt-Yorkley
8393414bf5
Adapt admin enterprise form handling for both address and business_address
2021-10-06 15:06:56 +05:30
Nihal Mohammed
83524f2285
Update en.yml to include translations for business_address form
2021-10-06 15:06:56 +05:30
Nihal Mohammed
7096667c6f
Add business_address form to business details section
2021-10-06 15:06:56 +05:30
Maikel Linke
eb87cdeb1c
Enable translation for "Save Changes" on customers page
2021-10-06 15:51:35 +11:00
Andy Brett
9b9db3202e
Merge pull request #8277 from sinansonmez/8223-remove-ask-checkbox
...
Ask checkboxes are removed from two pages
2021-10-05 14:44:27 -07:00
Sinan Chaush
01ee2070eb
producer id is used to select the producer
2021-10-05 21:35:18 +02:00
Sinan Chaush
771ee7b3dc
classes are removed from the texts
2021-10-05 17:30:56 +02:00
Sinan Chaush
2de8ba5e8d
make home page labels clickable
2021-10-04 21:11:12 +02:00
Sinan Chaush
7dc8500aa9
ask checkbox is removed from two pages
2021-10-04 17:08:32 +02:00
Sinan Chaush
70000db52c
when creating a product, preselect the supplier if there is only one
2021-10-03 11:51:41 +02:00
Yasuhiro Yoshida
ace8c8768f
Remove ng-if to filter out invisible enterprises from group
2021-10-01 15:21:13 +03:00
Matt-Yorkley
76c9f38fb6
Fix display of "inventory only" radio buttons
...
Previously the two radio buttons were not showing which option was set; both options were blank even if one had been selected.
2021-09-30 13:30:23 +01:00
Maikel
a3c31f7d86
Revert "Kill stripe connect"
2021-09-20 08:39:34 +10: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
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
Andy Brett
6e674b47ac
Merge pull request #8153 from sinansonmez/6140-change-profile-link-based-on-enterprise-profile
...
update profile link based on enterprise profile
2021-09-15 09:22:03 -07: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
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
Sinan Chaush
868187aaaf
create helper to select correct url
2021-09-09 22:22:25 +02:00
Sinan Sonmez (Chaush)
12c154934d
Update app/views/spree/admin/overview/single_enterprise_dashboard.html.haml
...
Co-authored-by: Maikel <maikel@email.org.au >
2021-09-09 16:29:28 +02:00
Meron Ogbai
4806ba540f
Add modals in orders page
2021-09-09 06:23:39 +03:00
Meron Ogbai
2de75ef7f4
Remove default rails confirm behavior
2021-09-09 06:22:55 +03:00
Meron Ogbai
d4f7b318e7
Add haml and css for custom modals
2021-09-09 06:21:14 +03:00
Sinan Chaush
f883e66c96
update profile link based on enterprise profile
2021-09-08 21:10:12 +02: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
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
086c5ab264
Replace directive with data-confirm
2021-09-08 10:34:34 +01:00
Matt-Yorkley
5ef34347a3
Implement optional non-Angular flash messages
2021-09-08 10:34:34 +01:00
Matt-Yorkley
03abc395f2
Update responses to use cable_ready
2021-09-08 10:34:34 +01:00
Matt-Yorkley
edb599b426
Disable Turbo page caching
2021-09-08 10:34:34 +01:00
Matt-Yorkley
062a3abc2d
Enable Turbo in the new checkout
2021-09-08 10:34:34 +01:00
Matt-Yorkley
6b028ba849
Disable Turbo site-wide
2021-09-08 10:34:34 +01:00
Matt-Yorkley
20ff594014
Set data-remote on checkout form
2021-09-08 10:34:34 +01:00
Matt-Yorkley
658f0eccbb
Replace ng-app with explicit Angular bootstrapping and move scripts to head
2021-09-08 10:34:34 +01:00
Matt-Yorkley
b4278aabbf
Merge branch 'master' into 8009-handling-shipping-adress
2021-09-07 09:44:49 +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
Jean-Baptiste Bellet
97fd7e3d78
Improve look and feel by adding some responsive margins
2021-09-01 17:16:30 +02: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
3fabe308cd
Extract #shipping_and_billing_match? helper
2021-09-01 15:04:33 +01:00
Matt-Yorkley
ebe2923512
Improve form outputs and error handling
2021-09-01 14:16:32 +01: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
Andy Brett
2d511c6d18
Merge pull request #8044 from apricot12/Undo_reversing_of_email_copy_paste
...
Allow copy paste of email from contact tab and footer without reversing
2021-08-26 10:02:09 -07:00
Jean-Baptiste Bellet
748a37f670
Terms and conditions error message
2021-08-26 09:28:31 +02:00
Jean-Baptiste Bellet
b5024c5a16
On summary page, display shipping address as well as billing one
2021-08-25 16:31:45 +02:00
Jean-Baptiste Bellet
10ddaf4384
Last step (ie. summary) is larger than the two previous step
2021-08-25 15:53:22 +02:00
Jean-Baptiste Bellet
75390d2a48
Specify right i18n key
2021-08-25 15:29:24 +02:00
