Matt-Yorkley
b86759d7a7
Fix form rendering in admin orders
...
ActionView::Template::Error: Nil location provided. Can't build URI.
0) Account and Billing Settings updating as an admin user loads the page
Failure/Error: = form_tag false, {name: "orders_form", "ng-submit" => "fetchResults()"} do
2020-02-05 16:37:23 +11:00
Luis Ramos
81103f3f71
Merge pull request #4742 from CSCI-462-01-2020/Issue4109
...
Edit new_resource partial
2020-02-04 19:44:16 +00:00
Luis Ramos
c7038f6ac9
Merge pull request #4620 from luisramos0/spree_backend_css
...
Bring basic CSS rules from spree backend
2020-02-04 18:06:15 +00:00
Luis Ramos
ea75714561
Merge pull request #4635 from luisramos0/main_app_routes
...
Replace use of spree.root_path and root_url with main_app.root_path and main_app.root_url
2020-02-04 16:02:48 +00:00
luisramos0
b7d19dd34c
Remove unused route from Spree.routes
2020-02-04 14:55:34 +00:00
luisramos0
44d1b3f00c
Remove unused search/users controller action
2020-02-04 14:55:34 +00:00
luisramos0
88464d58c2
Fix some rubocop issues and extract ransack hash to reduce repetition
2020-02-04 14:55:34 +00:00
luisramos0
962779bba1
Merge search controller with decorator
2020-02-04 14:54:51 +00:00
luisramos0
1ae73dd6ae
Add search_controller from spree_backend so that we can now merge it with the OFN's decorator
2020-02-04 14:54:51 +00:00
luisramos0
f48ab57782
Add explicit css import statements where they are needed
2020-02-04 14:52:44 +00:00
luisramos0
8b6ebfb351
Add imports for new css files from spree_backend
2020-02-04 14:52:44 +00:00
luisramos0
9c0788c3e0
Bring shared css rules from spree_backend
2020-02-04 14:52:17 +00:00
luisramos0
f61258d0b4
Bring components css from spree_backend
...
pagination and navigation rules were merged
2020-02-04 14:52:17 +00:00
luisramos0
289f62f115
Bring and require date picker css from spree_backend
2020-02-04 14:52:17 +00:00
luisramos0
c3a98d5a4f
Bring css dependencies from spree_backend
...
These dependencies are in spree_core so we dont need to bring them to ofn right now
2020-02-04 14:52:17 +00:00
luisramos0
0648f23e94
Move css dependencies to specific css files and add some required dependencies from spree_backend
2020-02-04 14:47:51 +00:00
luisramos0
e37cb2d63f
Remove underscope from select2 css file name
2020-02-04 14:47:51 +00:00
luisramos0
ee64238bdd
Add jquery.adaptivemenu require but commeent out the activation for now because it is already called in spree_backend
...
This can be reverted when spree_backend is removed
2020-02-04 14:47:51 +00:00
luisramos0
d3130e111f
Remove on click events
...
These events can only be added to OFN when spree_backend is removed otherwise the evetns will be registered twice
2020-02-04 14:47:51 +00:00
luisramos0
93f4eee887
Make newly imported js files compatible with the karma build
2020-02-04 14:47:51 +00:00
luisramos0
408ada9097
Remove unnecessary build exception
2020-02-04 14:47:51 +00:00
luisramos0
e14ebd9503
Add required variables from spree_backend
2020-02-04 14:47:51 +00:00
luisramos0
289b99c30e
Bring and require equalize from spree_backend
2020-02-04 14:47:26 +00:00
luisramos0
f85c36a17e
Bring and require select2 from spree_backend
2020-02-04 14:47:26 +00:00
luisramos0
4715df3258
Bring and require jquery.horizontalNav.js from spree_backend
2020-02-04 14:47:26 +00:00
luisramos0
b20be101cc
Bring and require spin from spree_backend and respective progress indicator js and css
2020-02-04 14:47:26 +00:00
luisramos0
d424987587
Bring and require jquery.vAlign.js from spree_backend
2020-02-04 14:47:26 +00:00
luisramos0
a0575430dd
Require spree.js from spree_core for some basic functions like Spree.url
2020-02-04 14:46:57 +00:00
luisramos0
c1e6344b18
Merge spree js function and override
2020-02-04 14:46:57 +00:00
luisramos0
ed0198382f
Bring spree_backend admin.js.erb, rename it to base.js.erb and remove requires that are not used in ofn
2020-02-04 14:46:57 +00:00
blainebillings
577fb88843
Move Create and Cancel References to Actions Namespace
2020-02-04 09:39:01 -05:00
blainebillings
22db2e99f0
Merge branch 'Issue4109' of https://github.com/CSCI-462-01-2020/openfoodnetwork into Issue4109
2020-02-04 09:38:19 -05:00
blainebillings
ef4aa488c3
Moves Create and Cancel References to Actions Namespace
2020-02-04 09:34:28 -05:00
Pau Pérez Fabregat
246235b921
Merge pull request #4667 from Matt-Yorkley/rails-4-prep
...
Rails 4 prep
2020-02-04 15:20:28 +01:00
luisramos0
d32e106bf0
Add partials needed in the orders edit page
2020-02-04 11:51:13 +00:00
luisramos0
bbb3748d3c
Simplify orders events logic
2020-02-04 11:51:13 +00:00
luisramos0
08dd992344
Merge orders_helper with decorator
2020-02-04 11:51:13 +00:00
luisramos0
914244a1ee
Bring orders helper from spree_backend
2020-02-04 11:51:13 +00:00
luisramos0
6e26841817
Fix load_order before filter and remove unused open and close adjustments actions
2020-02-04 11:50:44 +00:00
luisramos0
ab60c4a9dd
Remove unnecessary index action override because this is no longer a decorator
...
Remove useless todo comment
2020-02-04 11:50:44 +00:00
luisramos0
7009cd89e0
Fix rubocop issues in customer details controller and update rubocop manual todo accordingly
2020-02-04 11:50:44 +00:00
luisramos0
b93af37ea9
Merge customer details decorator with controller
2020-02-04 11:50:03 +00:00
luisramos0
76b6a85509
Merge spree/admin/orders_controller and its decorator and fix a few rubocop issues
2020-02-04 11:50:03 +00:00
luisramos0
a1d4b4ee98
Add orders_controller from spree_backend so that we can now merge it with the OFN's decorator
2020-02-04 11:50:03 +00:00
luisramos0
51bca7ce2f
Add customer_details_controller from spree_backend so that we can now merge it with the OFN's decorator
2020-02-04 11:50:03 +00:00
Luis Ramos
70147f908a
Merge pull request #4611 from luisramos0/taxonomies_js
...
Bring js code to make taxonomies admin work without spree_backend
2020-02-04 11:47:27 +00:00
Luis Ramos
c4bf4f001f
Merge pull request #4509 from luisramos0/backend_ctrl_payments
...
Bring spree_backend payments controller to OFN
2020-02-04 11:46:23 +00:00
Matt-Yorkley
7d71f21753
Add frozen_string_literal comment to new class
2020-02-04 11:11:24 +01:00
Matt-Yorkley
285c78a5e4
Remove use of #pluck and ensure subquery does not include all columns
2020-02-04 11:10:13 +01:00
luisramos0
9a2ad16926
Make explicit the dependency to font-awesome css rules
2020-02-04 09:34:59 +00:00
