Matt-Yorkley
fcff835922
Update results on dropdown select
2018-10-12 17:06:42 +01:00
Matt-Yorkley
dafcd0ddc2
Add per_page controls to admin orders index
2018-10-10 18:32:12 +01:00
Matt-Yorkley
37a7cceead
Fix bindings on angular orders data
2018-10-08 15:42:46 +01:00
Matt-Yorkley
55d7d5d1e4
Rename #capture_path to #payment_capture_path
2018-10-02 11:10:51 +01:00
Pau Pérez Fabregat
060b3c55f1
Merge pull request #2751 from luisramos0/2-0-order-details
...
[Spree Upgrade] Refactored spree/order_details, extracted delivery and pickup details into separate partials
2018-09-27 14:30:42 +02:00
Maikel
267edbdb45
Merge pull request #2752 from HugsDaniel/apply_overrides_to_shipping_methods_new
...
[Spree Upgrade] Replace Spree::ShippingMethods new view by our own and apply overrides
2018-09-25 11:37:46 +10:00
Matt-Yorkley
6f2760cf92
Move translations into their namespace and use '.key' format
2018-09-24 15:54:05 +01:00
Hugo Daniel
06ee75981a
Add require_shipping_address to shipping_methods_form
2018-09-24 12:35:40 +02:00
Matt-Yorkley
9f57b43a13
Move sortble header elements to a partial
2018-09-23 22:14:12 +01:00
Pau Pérez Fabregat
3c4ec62352
Merge pull request #2753 from HugsDaniel/apply_overrides_to_shipping_methods_edit
...
[Spree Upgrade] Replace Spree::ShippingMethods edit view by our own and apply overrides
2018-09-21 16:16:25 +02:00
Pau Pérez Fabregat
33fa687c28
Merge pull request #2755 from HugsDaniel/apply_overrides_to_shipping_methods_form
...
[Spree Upgrade] Replace Spree::ShippingMethods form partial by our own and apply overrides
2018-09-21 15:35:41 +02:00
Hugo Daniel
f9c5e732d8
Replace Spree::ShippingMethods form partial by our own and apply overrides
2018-09-20 19:21:02 +02:00
Hugo Daniel
0d7e24e554
Change to new ruby hash syntax
2018-09-20 14:34:10 +02:00
Hugo Daniel
b0fa76f519
Change to new ruby hash syntax
2018-09-20 14:32:27 +02:00
Hugo Daniel
07cbb08b42
Change to new ruby hash syntax
2018-09-20 14:28:20 +02:00
Hugo Daniel
56c1b073ee
Replace Spree::ShippingMethods new view by our own and apply overrides
2018-09-20 12:37:26 +02:00
Hugo Daniel
493da83378
Replace Spree::ShippingMethods index view by our own and apply overrides
2018-09-20 12:35:49 +02:00
Hugo Daniel
a14337df5c
Replace Spree::ShippingMethods edit view by our own and apply overrides
2018-09-20 12:34:16 +02:00
Matt-Yorkley
897e43fe0b
Remove Spree's Deface data-hooks from new view
2018-09-20 11:33:22 +01:00
Pau Perez
b77dd41eb0
Refactored spree/order_details, extracted delivery and pickup details into separate partials.
...
This was copied/adapted from 6f7c8bb8b1
2018-09-19 14:20:44 +01:00
Matt-Yorkley
3cbb576b4f
Move payment object logic out of order serializer and delete code
2018-09-19 13:00:30 +01:00
Matt-Yorkley
ba254802f8
Move angular_pagination to /views/admin/shared/
2018-09-19 13:00:30 +01:00
Matt-Yorkley
6768055b4d
Split orders into 2 angular controllers
2018-09-19 13:00:30 +01:00
Matt-Yorkley
68f0c80016
Add loading message and spinner
2018-09-19 13:00:30 +01:00
Matt-Yorkley
9da6a5a9b3
Add column sorting to table
2018-09-19 13:00:30 +01:00
Matt-Yorkley
2112f296e4
Angularise filters
2018-09-19 13:00:30 +01:00
Matt-Yorkley
3b9d9db16b
Add pagination
2018-09-19 13:00:29 +01:00
Matt-Yorkley
93d273f94a
Convert orders index table to use angular ng-repeat
2018-09-19 09:33:25 +01:00
Matt-Yorkley
e577bcb46f
Prepare angular controller and serialized data
2018-09-17 14:18:23 +01:00
Maikel
eabb9f4574
Merge pull request #2659 from kristinalim/translations-admin_area_fixes
...
Simple translation fixes for admin area and profile page
2018-09-14 14:38:25 +10:00
Maikel
da2f278060
Merge pull request #2649 from kristinalim/translations-fix_store_link_in_admin_header
...
Fix i18n translation for Store link in admin header for `fr`
2018-09-14 14:24:29 +10:00
Maikel
6b56def649
Merge pull request #2697 from mkllnk/2655-fix-admin-payments
...
2655 fix admin payments
2018-09-14 11:26:20 +10:00
Maikel
065df96872
Merge pull request #2675 from Matt-Yorkley/bi/remake_views
...
Remake orders index view
2018-09-13 12:29:54 +10:00
Maikel Linke
81f60aab46
Make PaymentMethod serialisable with fees
...
https://github.com/openfoodfoundation/openfoodnetwork/issues/2655
2018-09-13 12:01:17 +10:00
Matt-Yorkley
4d9ebf0550
Apply submenu override
2018-09-11 12:17:28 +01:00
Matt-Yorkley
f08d6389d8
Apply capture order override
2018-09-11 12:06:58 +01:00
Matt-Yorkley
507f4d0878
OCD tidy up of visually misaligned filter
2018-09-11 11:53:37 +01:00
Matt-Yorkley
afedaea2b5
Apply special instructions override
2018-09-11 11:49:28 +01:00
Matt-Yorkley
8f174b1308
Apply ship shortcut override
2018-09-11 11:43:38 +01:00
Matt-Yorkley
ba0701457e
Apply distributor td override
2018-09-11 11:42:08 +01:00
Matt-Yorkley
6389c552ca
Apply distributor th override
2018-09-11 11:41:25 +01:00
Matt-Yorkley
1958ac9932
Apply distributor filter inputs override
2018-09-11 11:39:05 +01:00
Matt-Yorkley
c7e2f817ed
Apply colgroup override
2018-09-11 11:34:34 +01:00
Matt-Yorkley
5a2491cb47
Apply ng-app override
2018-09-11 11:30:14 +01:00
Matt-Yorkley
980c46c63f
Convert Spree view to HAML
2018-09-11 11:22:54 +01:00
Kristina Lim
fc79aae17c
Translate authorized shops headers in account page
2018-09-08 00:34:47 +08:00
Kristina Lim
d06bccb832
Change i18n key for Store link in admin header
...
spree_i18n translates the "store" key in different ways, sometimes like
"shop" and sometimes like "save". This could be because of a clash in
usage between Spree add-ons.
To be more specific, the "Store" link in the admin section now uses the
"admin.header.store" translation key.
2018-09-06 22:03:39 +08:00
Kristina Lim
f5c44ef0e6
Rename "entreprise" in i18n keys to "enterprise"
2018-08-31 15:26:30 +08:00
stveep
17f2ba47ca
Add label for card field
2018-08-19 12:00:31 +01:00
stveep
8c6b8d5e84
Move injectors outside Stripe partial to satisfy dependencies
2018-08-19 11:50:34 +01:00
