Pau Pérez Fabregat
|
d4f2fcb98a
|
Merge pull request #4126 from Matt-Yorkley/cart_dropdown
Cart dropdown now closes when clicking outside it.
|
2019-08-13 10:57:56 +02:00 |
|
Pau Pérez Fabregat
|
910eca810a
|
Merge pull request #4124 from Matt-Yorkley/order_email
Add SKU to order confirmation email
|
2019-08-08 18:35:20 +02:00 |
|
Pau Pérez Fabregat
|
92b05c76a3
|
Merge pull request #4068 from luisramos0/replace_oc_rabl
Convert order_cycle.rabl to Api::OrderCycleSerializer
|
2019-08-08 12:23:09 +02:00 |
|
Maikel
|
229e6fa0a3
|
Merge pull request #4073 from luisramos0/kill_more_rabl
Replace update_prod_image.rabl with ImageSerializer in api/product_image_controller
|
2019-08-06 15:00:33 +10:00 |
|
Matt-Yorkley
|
8a069787d1
|
Cart dropdown now closes when clicking outside it.
|
2019-08-05 21:48:37 +01:00 |
|
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 |
|
Matt-Yorkley
|
c07df6a5a6
|
Fix table column alignments
|
2019-08-04 20:45:00 +01:00 |
|
Matt-Yorkley
|
a7d109833d
|
Add SKU to order confirmation email
|
2019-08-04 20:43:55 +01: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
|
62eb2bba13
|
Merge pull request #4059 from luisramos0/kill_rabl
Convert 2 rabl templates to AMS and remove a few unused ones
|
2019-07-30 19:28:21 +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
|
58b43c7bc9
|
Remove update_product_image.v1.rabl and switch controller from respond_with to render json to switch from rabl to AMS
|
2019-07-30 12:19:42 +01:00 |
|
luisramos0
|
04e13e1136
|
Change css styling from id to class to make rubocop happy. Keeping id name as it may be needed in spree autocomplete css or js code
|
2019-07-29 19:46:12 +01:00 |
|
luisramos0
|
ca5a5bf301
|
Convert oc.rabl to oc serializer and use it in both haml file and controller
|
2019-07-29 18:13:29 +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 |
|
luisramos0
|
9bc81f236c
|
Add doctype declaration as it is defined in spree layouts/admin so that html5 mode is enabled, otherwise html 4 mode is used by browsers and the observed layout problems happen
|
2019-07-29 13:46:35 +01:00 |
|
luisramos0
|
e26a54d897
|
Fix indentation problem in layouts/admin view
We move most entries inside wrapper as it should be and the last ones "admin_footer_scripts" and Spree.api_key inside the body tag as it should be
|
2019-07-29 13:33:11 +01:00 |
|
Luis Ramos
|
af50bde088
|
Merge pull request #3786 from ja9-look/feature/sticky_header_on_scroll_mobile
sticky header for mobile
|
2019-07-26 11:22:33 +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 |
|
Kristina Lim
|
def2693afc
|
Move offcanvas JS to Angular controller
|
2019-07-25 17:01:46 +08: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 |
|
Kristina Lim
|
fca82375e8
|
Render home page alert as :page_alert outside main content
|
2019-07-24 12:44:42 +08:00 |
|
Kristina Lim
|
ca0f746cf1
|
Fix animation and layout for offcanvas menu
Uses strategy from this forum comment:
http://foundation.zurb.com/forum/posts/547#comment_8840
|
2019-07-24 12:43:44 +08:00 |
|
luisramos0
|
ffb8edef0b
|
Fix rubocop css issues
|
2019-07-23 22:37:10 +01:00 |
|
luisramos0
|
90c621ac07
|
Improve translations, css and add button aligment in subscriptions_line_items variant autocomplete
|
2019-07-23 21:38:29 +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
|
cf61254c9e
|
Remove unnecesary rabl template
|
2019-07-22 18:42:20 +01:00 |
|
luisramos0
|
1d92d6cc33
|
Remove unused api endpoint order_cycles and also action enterprises/managed and respective views
|
2019-07-22 17:35:41 +01:00 |
|
luisramos0
|
6b32764c99
|
Remove unused taxon.rabl from views/json
|
2019-07-22 16:29:54 +01:00 |
|
luisramos0
|
ea72a10b9a
|
Remove unused rabl files from views/json
|
2019-07-22 12:14:10 +01:00 |
|
luisramos0
|
9b567a6710
|
Remove injection_json that renders json partials, we only use ams serializers now, not rabl partials
|
2019-07-21 23:55:59 +01:00 |
|
luisramos0
|
a8ce31fa90
|
Replace views/json/_flash.rabl with an ams injector with serializer
|
2019-07-21 22:56:15 +01:00 |
|
luisramos0
|
4c964fea0d
|
Replace views/json/_current_user.rabl with an ams injector with serializer
|
2019-07-21 22:48:36 +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 |
|