Pau Perez
7707df354b
Merge branch 'master' into 2-0-stable
...
* master: (206 commits)
embedded groups layout changes
embedded groups initial test
Allow html requests for OrderCycleController#update
Move applicator calls to OrderCycleForm
Refactor OrderCycleForm to make logic clearer
Extract schedule syncing logic into OrderCycleForm
Add basic specs for OrderCyclesController#create
Add basic OrderCycleForm to handle create/update logic
Remove unnecessary respond_to blocks from OrderCyclesController
Include admin users as managers on new enterprises
Remove obsolete goWithoutHashFragments
Simplify Navigation.go, not preserving hash fragments
Only show change warning for open order cycles
Use a SubscriptionsCount query object to provide counts to IndexOrderCycleSerializer
Preload subscription counts for serialization in order cycle collection actions
Request the subscription count for change warning each time, don't cache
Ask user to confirm oc date change for open order cycles with subsciptions
Fix ordering of Gemfile.lock
Add rack-rewrite to handle redirects
Renames product bulk edit action to index
...
2018-06-22 13:23:18 +02:00
Rob Harrington
a29a1bd047
Only show change warning for open order cycles
2018-06-20 16:28:36 +10:00
Rob Harrington
8770122eae
Request the subscription count for change warning each time, don't cache
2018-06-20 13:06:05 +10:00
Rob Harrington
86d7453d26
Ask user to confirm oc date change for open order cycles with subsciptions
2018-06-20 13:06:05 +10:00
luisramos0
b8f1571282
added directive to make links open in new tab by default in textangular text areas in enterprise description, enterprise group description and in shopfront open and closed messages
2018-06-19 16:53:21 +01:00
Pau Pérez Fabregat
20c25cd030
Merge pull request #2368 from Matt-Yorkley/uk/admin_orders
...
Uk/admin orders
2018-06-19 11:00:35 +02:00
Rob Harrington
dabef16606
Use ofn-select2 directive for country and state selectors on enterprise forms
2018-06-19 10:34:02 +10:00
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
Rob Harrington
d0f8e9fba6
Reimplement import date filter as an actual Filter
2018-06-15 11:31:47 +10:00
Hugo Daniel
6e2966d7e8
Changed require syntax to fit jquery < 5.0
2018-06-12 15:59:41 +02:00
Matt-Yorkley
d90e362e6f
Remove guest checkout radio buttons from admin order view
2018-06-09 02:43:42 +01:00
Matt-Yorkley
6f6db9384f
Tidy up SCSS and coffeescript
2018-05-26 19:34:20 +01:00
Matt-Yorkley
c5b7cec19f
Change checkbox confirmation behaviour
2018-05-26 19:34:20 +01:00
Matt-Yorkley
b42e3eb2c9
Product Import Guide WIP
2018-05-26 19:34:20 +01:00
Matt-Yorkley
7da97be7d2
Create separate angular module
2018-05-26 19:34:20 +01:00
Matt-Yorkley
c2c42e1d9a
Product Import refactor
2018-05-26 19:34:20 +01:00
Matt-Yorkley
1ed49d397e
Refactor PI
2018-05-26 19:34:20 +01:00
Matt-Yorkley
1c34ce6162
PI exception handling
2018-05-26 19:34:19 +01:00
Matt-Yorkley
6efd167400
PI inventories UX
...
Minor tweaks
2018-05-26 19:34:19 +01:00
Matt-Yorkley
fe01e8ede3
PI human-readable unit fields
...
Enhanced unit specs
2018-05-26 19:34:19 +01:00
Matt-Yorkley
b3c906b3a4
Product Import v3 with asynchronous processing
...
Fixed spec
Quick spec tweak
2018-05-26 19:34:19 +01:00
Matt-Yorkley
ffbb67d480
PI inventories additions
2018-05-26 19:34:19 +01:00
Matt-Yorkley
a2a65a8900
PI inventories and overhaul
2018-05-26 19:34:19 +01:00
Matt-Yorkley
e362c2d867
PI timestamps
2018-05-26 19:34:19 +01:00
Pau Perez
51f3542a92
Remove no longer used Angular controller
...
There are no tabs to keep track of now.
2018-05-22 10:21:35 +02:00
Daniel Dominguez
4551fa60c5
Lowercase tag when adding a tag to the array, as they are lowercased after at the database level,
...
there is no point to display them with uppercase letters on the view.
2018-05-11 11:16:58 +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
Rob Harrington
c77a01815c
Copy datepicker directive to utils module
...
Ensures that datepicker is available for subscriptions
2018-04-23 11:05:22 +10:00
Matt-Yorkley
37ba1e6c83
Close modal when image updated successfully
2018-04-15 20:52:25 +01:00
Rob Harrington
b17d8c2fe3
Add validation of open and close dates for order cycles
2018-04-04 17:18:32 +10:00
Rob Harrington
a83bdf16c9
Add error message for case when schedule cannot be deleted
2018-04-04 09:21:52 +10:00
Pau Pérez Fabregat
bbd2427493
Merge pull request #2075 from mjal/2001translations-missing-in-order-management-pages
...
i18n for admin/orders
2018-03-23 15:27:55 +01:00
Pau Pérez Fabregat
13115d4a2d
Merge branch 'master' into email/manager_invite
2018-03-23 12:56:10 +01:00
Pau Pérez Fabregat
1005c299a2
Merge pull request #1464 from Matt-Yorkley/uk/bep_images
...
Uk/bep_images
2018-03-23 12:40:16 +01:00
Pau Perez
d8dd84e64e
Fix enterprise filter in customers page
...
Angular's filter function uses a pattern object to filter specific
properties on objects contained by the array. We want an exact match
instead, which has to be done by means of a function.
2018-03-21 19:16:14 +01:00
Enrico Stano
3ce7bc54e3
Merge pull request #2143 from Matt-Yorkley/email/enterprise_user_ui
...
Fix enterprise user unsaved changes
2018-03-20 16:43:40 +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
JF-Lalonde
7a9f341363
Remove duplicated directive datepicker from index_utils directory
2018-03-14 17:01:54 +11:00
HugsDaniel
8c4d0f11d7
Changed status message with i18n t() filter to displau unsaved changes status for customers edition in admin dashboard
2018-03-13 21:03:54 +11:00
Rob Harrington
b98afc00ba
Show message about resumable orders when unpausing a subscription
2018-03-07 14:24:59 +11:00
Rob Harrington
7332e21013
Make InfoDialog more flexible (can show information as well as errors)
2018-03-07 14:24:58 +11:00
Rob Harrington
05e6c3daa6
Add message to indicate missing orders_close_at date
2018-03-02 13:28:34 +11:00
Rob Harrington
f1545a4ab6
Show fee estimates in subscription totals in UI
2018-03-02 10:11:26 +11:00
Enrico Stano
14caac0212
Merge pull request #2074 from mjal/2057states-are-not-displayed-in-modify-address-pop-in-and-prevent-saving-2
...
Bug fix in customers edit address
2018-03-01 14:59:02 +01:00
Enrico Stano
6e9efe79b7
Merge pull request #2053 from Matt-Yorkley/uk/enterprise_limit
...
Increase default enterprise limit
2018-03-01 14:40:24 +01:00
