Hugo Daniel
|
0a88738faa
|
Replace old ruby syntax with new
|
2019-07-24 14:37:00 +02:00 |
|
Hugo Daniel
|
4d6af57f79
|
De-deface product_properties/index
|
2019-07-24 13:17:45 +02:00 |
|
Hugo Daniel
|
110fd3ecdf
|
Convert erb to haml
|
2019-07-24 13:12:58 +02:00 |
|
Hugo Daniel
|
1cb065f829
|
Import product_properties/index.html.erb from spree_backend to ofn
|
2019-07-24 13:09:04 +02:00 |
|
Hugo Daniel
|
1cfa499b0e
|
De-deface _product_propery_fields
|
2019-07-24 13:01:50 +02:00 |
|
luisramos0
|
b9b8bc70dd
|
Remove stock location name from shipment header in the order edit page
|
2019-07-24 11:50:17 +01:00 |
|
Hugo Daniel
|
3fc0d4a666
|
Convert _product_properties_fields from ERB to Haml
|
2019-07-24 12:40:24 +02:00 |
|
Hugo Daniel
|
de6c96d138
|
Import product_properties/_product_properties_fields.html.erb from Spree to OFN
|
2019-07-24 12:38:29 +02:00 |
|
Kristina Lim
|
d42da8737e
|
Improve readability of selectors in page alert JS directive
|
2019-07-24 12:44:42 +08:00 |
|
Kristina Lim
|
6419edcb1f
|
Integrate styles/animations for page alert, top bar, tab bar, off canvas
|
2019-07-24 12:44:42 +08: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 |
|
Kristina Lim
|
a93cf46f50
|
Fix syntax of existing animations for offcanvas
|
2019-07-24 12:37:42 +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 |
|
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 |
|
luisramos0
|
11974689ef
|
Remove dead code under views/spree/shared
|
2019-07-23 16:42:00 +01:00 |
|
Kristina Lim
|
e1fce8304d
|
Update weight calculator and add specs
|
2019-07-23 23:24:00 +08:00 |
|
Kristina Lim
|
0d6ba90ea1
|
Round off fee from Calculator::Weight to nearest cent
|
2019-07-24 00:42:42 +10:00 |
|
luisramos0
|
a1e6e4c38f
|
Fix rubocop issues
|
2019-07-23 14:35:24 +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 |
|
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
|
81482683cf
|
Extract method in subs controller
|
2019-07-17 12:08:51 +01:00 |
|
luisramos0
|
57f1742f24
|
Save subscription form on subs unpause so that proxy orders and orders are synced
|
2019-07-17 12:08:48 +01: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 |
|