Matt-Yorkley
5603b70379
Fix html escaping of characters in AMS rendering causing fatal javascript errors
2020-02-22 11:06:51 +00:00
Matt-Yorkley
5b8552f541
Fix ActiveRecord::Relation issue
...
Rails 4 now returns an Activerecord::Relation when using `SomeModel.all`. To get all the objects (as in Rails 3) we need to use `SomeModel.all.to_a`. See: https://stackoverflow.com/a/22417170
2020-02-22 11:05:24 +00:00
Matt-Yorkley
6f62c2cf27
Fix SCSS import file error
2020-02-22 11:05:24 +00:00
luisramos0
4ca9a19d8a
Temporarily remove broken fontawesome and spree_paypal_express assets
2020-02-22 11:05:24 +00:00
luisramos0
9c369caae2
Temporarily comment part of Enterprise.relate_to_owners_enterprises so that most specs pass for now
2020-02-22 11:05:24 +00:00
luisramos0
18ca9980c9
Temporarily comment Enterprise.ensure_owner_is_manager otherwise all specs erroring out with 'Enterprise roles invalid'
2020-02-22 11:05:24 +00:00
luisramos0
8dbe4accaf
Upgrade to the spree branch 2-1-0-stable and rails 4.0.0
2020-02-22 11:05:24 +00:00
Luis Ramos
a3a61967a8
Merge pull request #4621 from luisramos0/spree_backend_js
...
OFN without spree_backend 🎉
2020-02-22 10:24:50 +00:00
Luis Ramos
0c4f22f847
Fix images/new.js path and add simple spec to verify the page loads correctly
...
Testing the file upload would be a bit more complicated
2020-02-20 11:18:22 +00:00
Luis Ramos
d99cba3b6e
Merge pull request #4709 from mkllnk/4172-js-pluralize
...
Pluralize common variant unit names
2020-02-19 22:28:54 +00:00
Luis Ramos
18c165e893
Merge pull request #4784 from CSCI-462-01-2020/Issue4731
...
Add Order Cycle Button Tooltips
2020-02-17 19:32:39 +00:00
Luis Ramos
9d8608f210
Merge pull request #4630 from Matt-Yorkley/product_counts
...
Show counts including all variants in order cycle exchanges
2020-02-13 11:33:58 +00:00
Luis Ramos
323ca906bc
Merge pull request #4759 from pacodelaluna/order-admin-products
...
Order admin products
2020-02-13 11:33:05 +00:00
Luis Ramos
c43b34e0fa
Merge pull request #4760 from luisramos0/checkout_ctrl
...
Merge Spree::CheckoutController with CheckoutController and clean it up
2020-02-13 11:31:15 +00:00
François Turbelin
4c7bd4d6a8
Fix mess with order
2020-02-13 06:38:13 +01:00
François Turbelin
523b266308
Put back created_at desc as default order
2020-02-13 06:38:13 +01:00
François Turbelin
212413c8b3
Avoid mutable q params
2020-02-13 06:38:13 +01:00
François Turbelin
b248dc598e
Cosmetics
2020-02-13 06:38:13 +01:00
François Turbelin
e7b74b99ba
Refactor SortingOptions JS
2020-02-13 06:38:13 +01:00
François Turbelin
89d2750fc4
Set default value at backend side
2020-02-13 06:38:13 +01:00
François Turbelin
7100111f93
Fix specs and cosmetics
2020-02-13 06:38:13 +01:00
François Turbelin
3dcb66014e
Factorize column sorter partial
2020-02-13 06:38:13 +01:00
François Turbelin
06971b7198
Add sortable name column for Admin Products
2020-02-13 06:38:13 +01:00
François Turbelin
56f9adc5b7
Filter Admin products by name asc
2020-02-13 06:38:13 +01:00
Luis Ramos
8d6a8ee214
Merge pull request #4763 from mkllnk/rails4-form-rendering
...
Future proof form rendering in admin orders
2020-02-12 20:56:00 +00:00
blainebillings
fec653186a
Add Order Cycle Button Tooltips
2020-02-11 10:10:39 -05:00
luisramos0
858d2cc6c2
Add doc to Spree::CheckoutController to make it more obvious why this controller exists
2020-02-07 11:50:23 +00:00
luisramos0
43280da187
Dup params to avoid nasty effects of a mutated params object in the controller
2020-02-07 10:26:04 +00:00
luisramos0
f0f537ff8f
Fix path of spree-select2.js pointing to the file in ofn rather the file in spree_backend
2020-02-06 11:21:47 +00:00
luisramos0
e5c9468d09
Fix rubocop issues in navigation_helper
2020-02-05 22:16:20 +00:00
luisramos0
8aed173127
Uncomment events in order edit page and remove unused spree autocomplete js code
2020-02-05 20:04:15 +00:00
luisramos0
61ecca7257
Move template loading to directive of customer search override
2020-02-05 20:04:15 +00:00
luisramos0
7eba657b2f
Add missing templates from spree_backend
2020-02-05 20:04:15 +00:00
luisramos0
784de340d1
Disable adaptive menu when running tests, this is what spree_backend was doing before
2020-02-05 20:04:15 +00:00
luisramos0
3decb4056c
Remove repeated include spree_paypal_express and add require css select2
2020-02-05 16:02:43 +00:00
luisramos0
8e9b08feca
Remove jquery-alerts from head html
2020-02-05 16:02:43 +00:00
luisramos0
694995ea5d
Prefix root_path with main_app so that ofn's route is used. The spree root path is no longer defined, we dont need it
2020-02-05 16:02:43 +00:00
luisramos0
2acf8e5125
Remove config_locale from base controller, in OFN we dont have separate locales for frontoffice and backoffice
2020-02-05 16:02:43 +00:00
luisramos0
687d827ceb
Add required css require for select2
2020-02-05 16:02:43 +00:00
luisramos0
2885e38113
Re-activate/re-add click events that were registered in spree_backend code before
2020-02-05 16:02:43 +00:00
luisramos0
9f3ca58b55
Add empty admin/spree_backend.js
...
This file is required by spree_paypal_express that we still need after leaving spree_backend
2020-02-05 16:02:43 +00:00
luisramos0
ffe3228848
Remove spree_backend dependencies from all.js and all.css and fix some dependencies path problems
2020-02-05 16:02:43 +00:00
luisramos0
834231eb8f
Add js code needed for the zones admin page
2020-02-05 16:02:43 +00:00
luisramos0
68f5aabd3f
Add js code needed where calculators are used: ship methods and payment methods config pages
2020-02-05 16:02:43 +00:00
luisramos0
7e7ea92833
Add js code needed in the states admin page
2020-02-05 16:02:43 +00:00
luisramos0
ebf22ceb19
Add js and css code for image settings from spree_backend
2020-02-05 16:02:43 +00:00
Luis Ramos
9313a57d19
Merge pull request #4511 from luisramos0/backend_ctrl_search
...
Bring spree_backend search controller to OFN
2020-02-05 15:54:30 +00:00
luisramos0
2663f74767
Add specs for new services
2020-02-05 14:49:17 +00:00
luisramos0
b41de52012
Moved checkout services into a specific folder under app/services
2020-02-05 14:49:17 +00:00
luisramos0
214eb43122
Add frozen string literal magic comment
2020-02-05 14:49:17 +00:00
