Commit Graph

92 Commits

Author SHA1 Message Date
luisramos0
d1019fcc5e changed the country and state selectors to angular on enterprises admin (new and edit screens) so that states are dynamically updated when country is changed 2018-06-19 10:34:02 +10:00
Maikel Linke
3fc49d5935 Simplify code 2018-04-23 12:55:49 +10:00
Matt-Yorkley
cd4268d219 Add manager dropdown UX 2018-04-23 12:55:49 +10:00
Pau Pérez Fabregat
13115d4a2d Merge branch 'master' into email/manager_invite 2018-03-23 12:56:10 +01:00
Matt-Yorkley
3fad51d271 Clearer angular method naming 2018-03-16 17:32:40 +00:00
Matt-Yorkley
5f0075f8b7 Refactor to use new REST resource 2018-03-16 17:32:38 +00:00
Matt-Yorkley
b64327fbb3 Invite enterprise manager functionality 2018-03-15 18:48:47 +00:00
Matt-Yorkley
5c6624e1d1 Tidy up setDirty() calls in enterprise_controller.js 2018-03-15 12:58:05 +00:00
Matt-Yorkley
4953c69123 Fix enterprise user unsaved changes 2018-03-14 23:04:54 +00:00
Matt-Yorkley
b893dea810 Make sure userSelect directive uses our Admin::UserSerializer instead of base Spree api view 2018-02-07 10:41:53 +11:00
Matt-Yorkley
fffae46a63 Remove enterpriseRoles from enterprsies controller 2018-02-07 10:41:53 +11:00
Matt-Yorkley
15b781b271 Update enterprise managers and contact role 2018-02-07 10:41:52 +11:00
Matt-Yorkley
27de66b055 Owner's permissions can't be deleted 2018-02-07 10:41:52 +11:00
Matt-Yorkley
ba98c7e2c5 Rewrite enterprise contact functionality 2018-02-07 10:41:52 +11:00
Rob Harrington
862443ed6d Add hash navigation to admin Enterprise edit view 2017-09-23 14:58:33 +10:00
Julius Pabrinkis
739d06cf03 Extract translations from javascript 2017-07-21 12:17:12 +10:00
Continuous Integration
5870927518 Merge remote-tracking branch 'origin/master' into HEAD 2017-02-10 16:42:27 +11:00
Rob Harrington
8afd5c509b Using coffescript syntax to check for presence of enterprise_form 2017-02-08 15:59:11 +11:00
Matt-Yorkley
311f72e4cb Fixing JS spec failure 2017-02-08 15:59:11 +11:00
Matt-Yorkley
78563a7d75 Changed for build failure 2017-02-08 15:59:11 +11:00
Matt-Yorkley
9284dd9b63 Enable save after deleting enterprise manager 2017-02-08 15:59:11 +11:00
Maikel Linke
b8622e95b7 Re-use NavigationCheck logic
The enterprise switcher now uses the same code as NavigationCheck to
confirm leaving a changed form. This makes FormState obsolete.

Conflicts:
	app/assets/javascripts/admin/enterprises/controllers/enterprise_controller.js.coffee
2017-02-02 10:58:32 +11:00
Matt-Yorkley
27903ab744 Merge branch 'master' into uk/switcher 2017-01-22 18:57:25 +00:00
Matt-Yorkley
931e528e14 Code review changes 2017-01-22 18:55:28 +00:00
Matt-Yorkley
287e0b5b55 Enterprise switcher and navigation check 2016-12-09 15:15:42 +00:00
Matt-Yorkley
7d7197da58 Reordered enterprises submenu 2016-12-09 14:31:34 +00:00
Rohan Mitchell
3e565ad7cb Mark admin enterprises form dirty when property removed 2016-11-04 09:39:17 +11:00
Bing Xie
33fd88507d Fix failed tests 2016-06-15 10:51:34 +10:00
Bing Xie
d8bf66a6c9 Use save bar on enterprise editing page 2016-06-15 10:51:34 +10:00
Bing Xie
2065d81bb4 Use save bar directive in enterprise editing page 2016-06-15 10:51:34 +10:00
Continuous Integration
ee10a4b173 Merge remote-tracking branch 'origin/master' into HEAD 2016-06-01 12:16:10 +10:00
Rob Harrington
8035b3f24a Refactoring admin table panels infrastructure
Updating enterprise index
2016-05-27 16:25:10 +10:00
Rob Harrington
1d8719b474 Default column visibility can be set per user using ColumnPreferences model 2016-05-25 08:10:20 +10:00
elf Pavlik
aa04da48f3 fixed i18n on admin edit enterprise 2016-05-22 18:40:42 -05:00
Rob Harrington
3d78b375c6 Moving angularjs tag rule logic into its own module 2016-04-01 19:48:25 +11:00
Rob Harrington
bf72864c2b Tag Rules can be deleted 2016-04-01 19:48:25 +11:00
Rob Harrington
4c2552e0bf Enterprise users can create tag rules 2016-04-01 19:48:25 +11:00
Rob Harrington
066190c16f First cut at an interface for updating tag rules 2016-04-01 19:48:25 +11:00
Maikel Linke
2a3b3b6dd2 Merge remote-tracking branch 'origin/master' into i18n-hackathon
Conflicts:
	app/assets/javascripts/admin/enterprise_fees.js
	app/assets/javascripts/admin/enterprises/controllers/side_menu_controller.js.coffee
	app/views/admin/shared/_columns_dropdown.html.haml
	app/views/admin/variant_overrides/_header.html.haml
	app/views/admin/variant_overrides/_products.html.haml
	spec/features/admin/bulk_order_management_spec.rb
	spec/features/admin/variant_overrides_spec.rb
2016-03-11 15:38:28 +11:00
Maikel Linke
071ee9ab54 Add brackets to t call in js line items controller
The missing brackets made all columns of the bulk order management
invisible.

Also removed trailing whitespaces.
2016-03-09 18:39:23 +11:00
Rob Harrington
f288c09380 Moving inventory settings to their own section within the enterprise edit form 2016-03-02 12:10:22 +11:00
knopfler81
ed48b691e1 translations in app/assets/javascripts/admin 2015-12-21 10:11:08 +01:00
Emmanuel
30141bd488 few translations in app/assets/javascripts/admin/ 2015-12-21 10:11:08 +01:00
Rob Harrington
eb7b2e7a3b Use ams_prefix not ams_suffix! 2015-11-05 17:17:45 +11:00
Rob Harrington
ae7e744644 WIP: BOM Refactor, adding for_line_items action to enterprises controller 2015-11-04 15:02:29 +11:00
Rob Harrington
066c8876ff Only serializing unresolved enterprise issues, styling tweaks and fixes for index 2015-06-12 15:49:01 +08:00
Rob Harrington
775718c776 Adding status panel on enterprise index 2015-06-12 12:09:00 +08:00
Rob Harrington
1c1f82f4ee Using events to update index row text on save, adding alert icons for enterprises without producer or package selected 2015-06-12 01:49:37 +08:00
Rob Harrington
5a08344812 Changing 'shop' column and panel to 'package' 2015-06-12 01:49:37 +08:00
Rob Harrington
6b35e993bd WIP: More work on panel content, styling and data submission logic 2015-06-12 01:49:36 +08:00