Hugo Daniel
fa6fa0be64
Add missing translation
2019-08-08 11:11:32 +02:00
Hugo Daniel
a3af6617a9
Convert payments/show from erb to haml
2019-07-31 16:20:32 +02:00
Hugo Daniel
9f7fb654c8
Import payments/show.html.erb from spree_backend
2019-07-31 16:16:26 +02:00
Hugo Daniel
b4a6686eac
Convert payments/_list from erb to haml
2019-07-31 16:15:38 +02:00
Hugo Daniel
ac13ff114c
Import payments/_list.html.erb from spree_backend
2019-07-31 16:09:48 +02:00
Hugo Daniel
af9187947f
Convert erb to haml
2019-07-31 16:02:48 +02:00
Hugo Daniel
f0fdbf7cf4
Import payments/index from spree_backend
2019-07-31 14:33:38 +02:00
Hugo Daniel
74ab31c0e6
Import gateway.html.erb and convert to haml
2019-07-31 14:28:15 +02:00
Hugo Daniel
3c2b6f4ed1
Remove data-hooks
2019-07-25 14:38:09 +02:00
Hugo Daniel
aae5ae9f1e
De-deface payments/new
2019-07-25 13:27:41 +02:00
Hugo Daniel
888e0e0bb4
Convert erb partials to haml
2019-07-25 13:22:55 +02:00
Hugo Daniel
a0b0fb05a6
Import payments/new from spree_backend to ofn
2019-07-25 13:22:32 +02:00
Luis Ramos
55f26f0a3d
Merge pull request #4043 from luisramos0/bring_shipment
...
Bring spree/admin/orders/shipment and shipment_manifest partials from spree_backend and fix an authorization bug
2019-07-24 21:59:47 +01:00
Luis Ramos
7245d1eff4
Merge pull request #4049 from luisramos0/deface_admin_orders
...
De-deface admin orders adjustments page and customer details page
2019-07-24 21:59:08 +01:00
luisramos0
b9b8bc70dd
Remove stock location name from shipment header in the order edit page
2019-07-24 11:50:17 +01:00
Luis Ramos
1f75c7e5e4
Merge pull request #4047 from luisramos0/undeface
...
De-deface some admin configuration pages and the general admin layout and menu
2019-07-23 18:36:09 +01:00
Luis Ramos
77fb73f802
Merge pull request #4065 from coopdevs/get-latest-spree-revision
...
Brings in the latest Spree fork's Git commit
2019-07-23 14:28:49 +01:00
Pau Perez
9f7376a5ae
Brings in the latest Spree fork's Git commit
...
This successfully closes #3903 by bringing in the changes done in
https://github.com/openfoodfoundation/spree/pull/41 .
2019-07-23 14:56:33 +02:00
Luis Ramos
eae373ef4b
Merge pull request #4061 from openfoodfoundation/revert-3938-get-last-spree-fork-patch
...
Revert "Handle soft deleted variants in order edit"
2019-07-22 21:06:10 +01:00
Luis Ramos
465332d5f9
Revert "Handle soft deleted variants in order edit"
2019-07-22 21:05:41 +01:00
Luis Ramos
e98b89625f
Merge pull request #3938 from openfoodfoundation/get-last-spree-fork-patch
...
Handle soft deleted variants in order edit
2019-07-22 21:05:12 +01:00
Pau Perez
be4fbc4d23
Update Gemfile to get spree from a feature branch
...
This allows us to test
https://github.com/openfoodfoundation/spree/pull/41 . If it passes
testing I will then revert it back to the `2-0-4-stable` branch but
updating the target commit in the Gemfile.lock.
2019-07-22 15:40:31 +02:00
Luis Ramos
a6a695660f
Merge pull request #4002 from luisramos0/more_rails4
...
Adapting queries in permissions to Rails 4
2019-07-19 15:17:01 +01:00
Luis Ramos
0058ef5e04
Merge pull request #4048 from idanceinbetween/4034
...
Add grey line below nav bar, change logo img max height 44px
2019-07-19 12:13:14 +01:00
Luis Ramos
4831bae9cb
Merge pull request #3953 from mkllnk/3727-first-credit-card-default
...
First stored credit card becomes default again
2019-07-19 12:12:09 +01:00
Luis Ramos
f7679780de
Merge pull request #4032 from luisramos0/subs_oc_date_issue
...
3544 Add date format to moment date conversion
2019-07-18 19:52:49 +01:00
luisramos0
f2ac354e00
Make features/admin/orders_spec test a bit more reliable by expecting element to be there before using it
2019-07-18 14:29:38 +01:00
Maikel
88ffa46ce7
Merge pull request #4045 from openfoodfoundation/transifex
...
Transifex
2019-07-18 16:35:41 +10:00
Maikel
869431c68d
Merge pull request #3926 from mkllnk/report-missing-payments
...
Add rake task to report lost payments
2019-07-18 15:01:14 +10:00
Maikel
a1f8530489
Merge pull request #3962 from luisramos0/first_view_spec
...
First 2 view specs in OFN
2019-07-17 10:57:58 +10:00
luisramos0
a75a0da981
Remove unused deface in spree/admin/orders/show, this action doesnt exist in ofn v2
2019-07-16 21:12:48 +01:00
luisramos0
5744240f91
Move customer_details/_form defaces to the view
2019-07-16 21:12:09 +01:00
luisramos0
873c56a642
Move customer_details/edit/replace_customer_search deface to view
2019-07-16 21:09:48 +01:00
luisramos0
f53a75660f
Convert spree/admin/orders/customer_details view from erb to haml
2019-07-16 21:05:19 +01:00
luisramos0
50dcbe0b57
Bring spree/admin/order/customer_details from spree_backend
2019-07-16 21:03:35 +01:00
luisramos0
f9861fee79
De-deface spree/admin/adjustments/_adjustments_table by moving deface content to the view
2019-07-16 21:01:08 +01:00
luisramos0
d8ae97f923
Move spree/admin/adjustments/_form/add_tax_rate deface to view
2019-07-16 20:53:24 +01:00
luisramos0
9f5db217fe
Convert spree/admin/adjustments views from erb to haml
2019-07-16 20:51:55 +01:00
luisramos0
c1c5dcac09
Bring spree/admin/adjustments pages from spree_backend
2019-07-16 20:51:55 +01:00
luisramos0
6064f096a7
Fix a pre-existing problem in orders_tab by moving the links in to the li elements
2019-07-16 20:16:32 +01:00
luisramos0
a62fa755f5
Remove page_title_classes as it is breaking the rendering of the classes attribute and it is no longer used
2019-07-16 20:16:32 +01:00
luisramos0
fa25991f0f
Fix problem in previous de-deface, move sections around in general settings page to keep order. No changes in code, just moving
2019-07-16 20:16:32 +01:00
luisramos0
6f2be1dfa6
Fix issue in layouts/admin view, make classes compute correctly
2019-07-16 20:16:32 +01:00
luisramos0
c81a9fd032
Fix error in js tag in head
2019-07-16 20:16:32 +01:00
luisramos0
665d0cc86b
Fix error related to missing _hamlout method by replacing code with standard haml
2019-07-16 20:16:32 +01:00
luisramos0
a34d8a3f20
Revert "Move app_wrapper deface to spree/layouts/admin view"
...
This reverts commit bb18f6ecf3c1d0ecf7c010623215d161a6102f2b.
2019-07-16 20:16:32 +01:00
luisramos0
6e35701dd6
Remove unused add_enterprise_fees_to_admin_configurations_menu deface, this menu entry is already in the view
2019-07-16 20:16:32 +01:00
luisramos0
9991458d2a
Remove spree/admin/shared/_order_details defaces, these are only used in admin/order/show which is a view that is not used in ofn anymore, only admin/order/edit is used
2019-07-16 20:16:32 +01:00
luisramos0
a843fd73b7
Remove admin/shared/_order_tabs/add_customer_name, this is already in the order tabs view
2019-07-16 20:16:32 +01:00
luisramos0
9765b1e908
Move admin/shared/_head/replace_spree_title deface to head view
2019-07-16 20:16:32 +01:00
