Hugo Daniel
|
c464b21d76
|
Remove data-hooks
|
2019-07-25 14:27:53 +02:00 |
|
Hugo Daniel
|
c83d249147
|
Impor missing partials from spree to ofn and convert to haml
|
2019-07-25 14:23:24 +02:00 |
|
Kristina Lim
|
dae23d3c3b
|
Remove unused inclusion of $window in OffcanvasCtrl
|
2019-07-25 20:22:51 +08: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 |
|
Hugo Daniel
|
a11562e4dd
|
Fix incorrect indentation in variants table
|
2019-07-25 12:05:50 +02:00 |
|
Hugo Daniel
|
2d872c25bf
|
Use Haml javascript tag to make autocomplete work
|
2019-07-25 11:20:51 +02:00 |
|
Hugo Daniel
|
986837d601
|
Import variants/_form.html.erb from spree_backend to ofn and de-deface it
|
2019-07-25 11:07:35 +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
|
353d6fbc5f
|
Import variants/index from spree_backend to ofn and convert to Haml
|
2019-07-24 16:57:11 +02: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 |
|
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
|
74a030f6db
|
Organizing spec/serializers - put each file in the correct place acccording to its namespace
|
2019-07-23 22:17:28 +01:00 |
|
luisramos0
|
7a8b5e89be
|
Add specs to cover the most important new fields in api/admin/variant_serializer
|
2019-07-23 22:11:00 +01:00 |
|
luisramos0
|
90690cd238
|
Move api/admin/variant_serializer_spec to the correct folder under /spec
|
2019-07-23 22:03:40 +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 |
|
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 |
|
luisramos0
|
5739a82c19
|
Remove unused admin variants search rabl template
|
2019-07-23 12:30:00 +01: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 |
|
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 |
|