Maikel
b63c47cca2
Merge pull request #4816 from mkllnk/1860-copy-paste
...
1860 Remove style from pasted text for shopfront messages
2020-03-18 16:23:50 +11:00
Pau Pérez Fabregat
5811f3ead1
Merge pull request #4905 from luisramos0/untouch
...
Remove some live but elderly debug code
2020-03-10 09:17:13 +01:00
Luis Ramos
af8369ae1b
Remove 5 years old debug code
...
This reverts ab9bc7b1dc
2020-03-03 10:56:57 +00:00
Eduardo
64d83bfc4d
fix ampersand problem using ng-bind-html
2020-03-01 17:54:36 -03:00
Maikel Linke
325c427219
Remove style from pasted HTML in editor
2020-02-24 11:22:47 +11: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
blainebillings
fec653186a
Add Order Cycle Button Tooltips
2020-02-11 10:10:39 -05:00
Matt-Yorkley
140e0b9cb1
Refactor #exchangeLoadedVariants
2020-02-05 15:11:34 +01:00
Matt-Yorkley
6f644936b0
Show counts including all variants in order cycle exchanges
2020-02-05 15:10:26 +01: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
Matt-Yorkley
91d959b7d6
Remove "previous" button from order cycle savebar
2020-01-03 16:25:26 +01:00
luisramos0
55bb328d48
Prefix all calls to root_url with main_app
2019-12-28 18:46:50 +00:00
Luis Ramos
db7146014c
Rename exchange products file names to increase clarity
2019-12-13 12:24:19 +00:00
Luis Ramos
c6af55d9ae
Restructure exchange products panels so that OC simple form does not include header and footer (product count and pagination) of the non-simple OC form
2019-12-13 12:24:16 +00:00
luisramos0
99e59595b4
Add spinner when loading all products in an exchange
2019-12-12 18:48:36 +00:00
luisramos0
7e3b6e2b5d
Fix select all checkbox state in both incoming and outgoing exchanges by using the total count of variants to see if all variants are selected or not, even if not all variants are loaded
2019-12-12 18:48:36 +00:00
luisramos0
1a9c3007b0
Make select all work again in incoming exchanges by loading alll products before triggering the select all process
2019-12-12 18:48:35 +00:00
luisramos0
0416521772
Add load all prouducts button to list of exchange products
2019-12-12 18:48:35 +00:00
luisramos0
cfe3f72d0e
Add load more button to list of exchange products
2019-12-12 18:48:35 +00:00
luisramos0
9451f1b66d
Remove funky panel open listener code and initialize the panel data with a ng-init in the panel template
2019-12-12 18:44:45 +00:00
luisramos0
3223bf930d
Make total number of products in exchange work again.
...
Currently we are just loading the products from the server and count them.
This can be improved easily in two ways:
- we can switch this to a specific product count call to the server so that we dont load all products all the time
- or we paginate the products result and fetch the total_number from the payload of the first page.
2019-12-12 18:44:44 +00:00
luisramos0
24d7672abb
Use new exchange products endpoint for outgoing exchanges and make the exchange products panel work for outgoing exchanges
2019-12-12 18:44:44 +00:00
Luis Ramos
008921c201
Merge pull request #4447 from luisramos0/clickable_steps
...
Clickable steps on the OC edit page
2019-11-20 21:16:07 +00:00
luisramos0
5cadb0d16f
Make ready for field show with red borders immediatly after exchange is added to the list
2019-11-12 12:06:44 +00:00
luisramos0
6875e9a41e
Make view a bit simpler by removing unnecessary string interpolation
2019-11-12 12:05:40 +00:00
luisramos0
b6f1d6e395
Make OC edit page steps clickable when editing an OC
2019-11-12 12:05:40 +00:00
luisramos0
5fdb86ae43
Make simple create redirect to OC list but normal create to jump to incoming settings
2019-11-12 12:00:48 +00:00
luisramos0
7845b6c6fb
Use only AdminOrderCycleIncomingCtrl in incoming view and make AdminOrderCycleIncomingCtrl extend AdminEditOrderCycleCtrl
...
Same for AdminOrderCycleOutgoingCtrl
2019-11-12 12:00:48 +00:00
luisramos0
e03e3ae50a
Fix the simple edit OC and the new OC page flows
2019-11-12 12:00:48 +00:00
luisramos0
305d7b1125
Adapted navigation between OC edit pages by adding new previous and next buttons
2019-11-12 12:00:48 +00:00
luisramos0
5ef751d409
Add wizard to OC new and edit pages
2019-11-12 12:00:48 +00:00
luisramos0
683232dd10
Improve page titles and fix broken translation
2019-11-12 12:00:48 +00:00
luisramos0
5f1360e226
Move incoming and outgoing parts of the (not simple) OC new and edit pages to separate routes and views to make this page a multi step page
2019-11-12 12:00:48 +00:00
luisramos0
10f0906689
Remove obsolete view, this code is now in app/assets/javascripts/templates/admin/panels/exchange_supplied_products.html.haml
2019-11-01 17:18:48 +00:00
Luis Ramos
d1b36aded0
Merge pull request #4359 from daningenthron/daningenthron/required-fields-new-order-cycle
...
Add asterisks to required fields in New Order Cycle form
2019-10-31 12:50:48 +00:00
Luis Ramos
9c3c74aa93
Merge pull request #4394 from luisramos0/fix_product_sub_menu
...
Merge duplicated product_sub_menu partials
2019-10-31 12:48:27 +00:00
Luis Ramos
498a2b7462
Merge pull request #4386 from andrewjprice/missing-translations-inventory-page
...
Missing translations inventory page
2019-10-24 17:06:43 +01:00
luisramos0
cc342387cc
Make all calls to content_for use dash not equals when setting content_for
2019-10-23 12:42:29 +01:00
luisramos0
6715f872e3
Merge duplicated product_sub_menu partials and make all references point to the one located in the spree folder (we keep this one because we still have some views in spree backend referencing this partial
2019-10-23 12:26:18 +01:00
Dan Ingenthron
3c7af90dfa
Revert I18n change and reflect correct required fields on OC form
2019-10-22 17:41:38 -05:00
Dan Ingenthron
85dede84cc
Update order cycle forms & en.yml to include asterisks
2019-10-22 17:41:37 -05:00
luisramos0
3372339907
Fix default stock translation by using t filter instead of t function
2019-10-22 17:29:04 +01:00
Andrew
deb17f47a7
Add default_stock to en.yml and _products_variants
2019-10-19 16:33:31 -07:00
Andrew
598426a5e9
Add Save Changes button translation
2019-10-18 22:18:54 -07:00
Matt-Yorkley
ab330e882e
Remove product cache
2019-10-18 21:15:11 +01:00
luisramos0
d038c27f1f
Fix app_wrapper_attr code by making the content_for tag be only the name of the ng-app and ng-ctrller
2019-09-11 10:32:30 +01:00
Matt-Yorkley
6ba98b4b2c
Add beta notice to Product Import
2019-08-06 17:02:38 +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
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
ffb8edef0b
Fix rubocop css issues
2019-07-23 22:37:10 +01:00
