Pau Pérez Fabregat
|
64d21969f0
|
Merge pull request #4064 from luisramos0/convert_search_Rabl
Replace views/admin/variants/search.rabl with Api::Admin::VariantSerializer
|
2019-08-05 15:07:10 +02:00 |
|
Luis Ramos
|
f9fabd088c
|
Merge pull request #4075 from HugsDaniel/defacepocalypse-payment-methods
[Defacepocalypse] De-deface payment methods index
|
2019-07-31 15:49:48 +01:00 |
|
Luis Ramos
|
75c7e0b939
|
Merge pull request #4089 from luisramos0/undeface-fix
Add doctype declaration in layouts/admin view
|
2019-07-30 19:29:17 +01:00 |
|
Luis Ramos
|
3fa9e857a8
|
Merge pull request #4067 from luisramos0/oc_icon
Add icon to OC menu entry
|
2019-07-30 14:08:08 +01:00 |
|
luisramos0
|
ddf68444fb
|
Move head scripts from admin layout to haed partial
|
2019-07-29 17:04:57 +01:00 |
|
luisramos0
|
4867649fc9
|
Remove dead code related to unused variable in spree: expand_variants
|
2019-07-29 17:04:57 +01:00 |
|
Luis Ramos
|
340b92e580
|
Merge pull request #3700 from luisramos0/2-0-without-auth-devise
Remove dependency to spree_auth_devise
|
2019-07-26 10:57:38 +01:00 |
|
luisramos0
|
f64653db14
|
Add icon to OC menu entry
|
2019-07-26 10:52:31 +01:00 |
|
Hugo Daniel
|
6a621f47aa
|
Remove data-hooks
|
2019-07-25 14:31:07 +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 |
|
Hugo Daniel
|
87ef0215b8
|
De-deface payment_methods/index
|
2019-07-24 14:49:29 +02:00 |
|
Hugo Daniel
|
4b6a02cb92
|
Convert payment_methods/index from ERB to Haml
|
2019-07-24 14:39:59 +02:00 |
|
Hugo Daniel
|
196a301133
|
Import payment_methods/index.html.erb from spree_backend to ofn
|
2019-07-24 14:38:20 +02:00 |
|
luisramos0
|
b9b8bc70dd
|
Remove stock location name from shipment header in the order edit page
|
2019-07-24 11:50:17 +01:00 |
|
luisramos0
|
2d5eccbf97
|
Add :in_stock, :stock_location_id, :stock_location_name to admin variant serializer, these are needed for the variant_autocomplete js code from spree
|
2019-07-23 21:38:29 +01:00 |
|
luisramos0
|
7e6259da31
|
Replace admin/variants/search rabl template with existing admin variant serializer with a few added attributes
This commit fixes a bug as the image of the variatn was not being rendered, we need to fetch the image of the product, not the image of the variant.
|
2019-07-23 21:37:45 +01:00 |
|
luisramos0
|
5739a82c19
|
Remove unused admin variants search rabl template
|
2019-07-23 12:30:00 +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
|
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
|
c81a9fd032
|
Fix error in js tag in head
|
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 |
|
luisramos0
|
5ccadc1f7d
|
Convert spree/admin/shared/_head view from erb to haml
|
2019-07-16 20:16:32 +01:00 |
|
luisramos0
|
539805e2c2
|
Bring spree/admin/shared/head partial from spree_backend
|
2019-07-16 20:16:32 +01:00 |
|
luisramos0
|
e3c383c61c
|
Convert spree/admin/shared/_tabs.html from erb to haml and move menu entries from layouts/admin to the tabs view
|
2019-07-16 20:16:32 +01:00 |
|
luisramos0
|
e36b4ed01a
|
Move temp_controller_list deface to shipping_categories index view
|
2019-07-16 20:16:23 +01:00 |
|
luisramos0
|
4f60273198
|
Move temperature_controlled_form_element deface to shipping_categories form view
|
2019-07-16 14:50:16 +01:00 |
|
luisramos0
|
856fa8685a
|
Convert spree/admin/shipping_categories views from erb to haml
|
2019-07-16 14:48:47 +01:00 |
|
luisramos0
|
9ac4c0ba30
|
Bring spree/admin/shipping categories from spree_backend so we can de-deface it
|
2019-07-16 14:46:26 +01:00 |
|
luisramos0
|
2709f237f5
|
Move image_format deface to image settings view
|
2019-07-16 14:44:38 +01:00 |
|
luisramos0
|
9db4edcd0d
|
Convert spree/admin/image_settings/edit.html from erb to haml
|
2019-07-16 14:43:20 +01:00 |
|
luisramos0
|
22c9f33f4c
|
Bring image_settings view from spree_backend
|
2019-07-16 14:39:14 +01:00 |
|
luisramos0
|
24ea2a4398
|
Move number_localization deface to general settings view
|
2019-07-16 14:28:47 +01:00 |
|
luisramos0
|
8178f5388c
|
Move legal settings deface to general settings view
|
2019-07-16 14:27:32 +01:00 |
|
luisramos0
|
c0c5e9d7dd
|
Move embedded_shopfronts deface to general settings view
|
2019-07-16 14:26:33 +01:00 |
|
luisramos0
|
19f8f5c6fa
|
Convert general_settings/edit.html from erb to haml
|
2019-07-16 14:15:51 +01:00 |
|
luisramos0
|
83a306c31b
|
Convert class attributes to . notation in haml
|
2019-07-16 14:09:48 +01:00 |
|
luisramos0
|
d6020cdb6f
|
Bring general_settings/edit.html.erb from spree_backend to de-deface it
|
2019-07-16 13:57:35 +01:00 |
|
luisramos0
|
e8127d81dc
|
Change how we display variant name in order edit page, use VariantAndLineItemNaming helper method
|
2019-07-15 18:37:19 +01:00 |
|
luisramos0
|
cd7906a57b
|
Move translations from Spree.t to root and add them to en.yml
|
2019-07-15 17:48:10 +01:00 |
|
luisramos0
|
02c573f146
|
Remove logic that hides item split, because the partial is now in the ofn codebase, we can now simply remove the split-item button
|
2019-07-15 17:11:41 +01:00 |
|
luisramos0
|
112017a158
|
Remove variants/split partial from orders/shipments partial
In OFN we have one shipment per order so it doesnt make sense to split items between shipments
|
2019-07-15 17:07:33 +01:00 |
|