raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-11 23:17:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,044 Commits 19 Branches 453 Tags
b2fb0366f733f65ca0be58e77f6c8ecd32aed4c9
Commit Graph

4997 Commits

Author SHA1 Message Date
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
Jean-Baptiste Bellet
82ea33e9ca Do not display ship address form if not needed 
ie. the shipping method does not require any address
 2021-08-25 11:10:47 +02:00
vishaldeepak
813deb49a4 Add customer information to mail when we notify producers when required 2021-08-25 08:29:54 +05:30
Andy Brett
ea6739d565 guard against a nil value for @order.user 2021-08-24 11:46:50 -07:00
Jean-Baptiste Bellet
1ecfeca88c Populate view with both shipping_method_id & ship_address_same_as_billing 
... and then handle correctly the display of the form
 2021-08-23 15:23:53 +02:00
Jean-Baptiste Bellet
fe65359d71 Display no shipping method selected error 2021-08-23 10:16:53 +02:00
Matt-Yorkley
697a073330 Merge pull request #8060 from Matt-Yorkley/script-split 
Maps and AMS conditional loading
 2021-08-21 16:35:46 +02:00
Jean-Baptiste Bellet
8fe0a82b75 Change ng-click to ng-change to capture ng-model updated value 
- Create a feature test for this feature
 2021-08-20 15:18:09 +02:00
Nihal Mohammed
92ecdb4163 Add Angular directive to undo reverse of email 2021-08-20 18:34:42 +05:30
Nihal Mohammed
d2dcfa5848 Undo changes 2021-08-20 13:15:44 +05:30
Jean-Baptiste Bellet
402bfdac30 Show/Hide shipping address form depending on the checkbox/radio state 2021-08-19 10:34:07 +02:00
Jean-Baptiste Bellet
c806b3e889 Be more generic: address is enough 
as it could be billing or shipping address
 2021-08-19 10:33:16 +02:00
Matt-Yorkley
63dc188d5e Merge pull request #8032 from Matt-Yorkley/order-confirm 
Split checkout backend
 2021-08-16 23:12:06 +02:00
Matt-Yorkley
744bd9d1be Only load Google Maps JS where it's actually needed 2021-08-16 15:31:00 +01:00
Matt-Yorkley
a98e4417c0 Only inject taxons and properties AMS data in pages where it's actually needed 2021-08-16 13:22:06 +01:00