luisramos0
87cd73ddba
Merge branch 'master' into 2-0-stable-oct
2018-10-15 17:09:26 +01:00
Matt-Yorkley
dafcd0ddc2
Add per_page controls to admin orders index
2018-10-10 18:32:12 +01:00
Pau Pérez Fabregat
85962158b8
Merge pull request #2821 from nikobozi/oc-clear-filter
...
Make 'Clear All' button work on order cycle page
2018-10-09 16:35:57 +02:00
niko
f99ed81863
Make 'Clear All' button work on order cycle page
2018-10-04 11:46:38 +02:00
Matt-Yorkley
64620c2797
Tidy up response formats for easier testing
2018-09-19 13:00:30 +01:00
Matt-Yorkley
6768055b4d
Split orders into 2 angular controllers
2018-09-19 13:00:30 +01:00
Matt-Yorkley
b2551b4e0b
Rewrite existing specs
2018-09-19 13:00:30 +01:00
Matt-Yorkley
9da6a5a9b3
Add column sorting to table
2018-09-19 13:00:30 +01:00
Matt-Yorkley
2112f296e4
Angularise filters
2018-09-19 13:00:30 +01:00
Matt-Yorkley
3b9d9db16b
Add pagination
2018-09-19 13:00:29 +01:00
Matt-Yorkley
93d273f94a
Convert orders index table to use angular ng-repeat
2018-09-19 09:33:25 +01:00
Matt-Yorkley
e577bcb46f
Prepare angular controller and serialized data
2018-09-17 14:18:23 +01:00
Maikel
ce7be68fac
Merge pull request #2660 from kristinalim/translations-failed_oc_creation
...
Translate and fix fallback errors when creating or updating OC
2018-09-14 16:58:39 +10:00
Maikel
beedd933e9
Merge pull request #2512 from kristinalim/feature-remove_enterprise_images
...
Support removal of enterprise logo and promo image
2018-09-14 15:07:24 +10:00
Pau Pérez Fabregat
64e71a1ee7
Merge pull request #2544 from kristinalim/fix-scrolling_in_modals
...
Fix top position, height, and scrolling with modals
2018-09-12 13:05:20 +02:00
Kristina Lim
003e65fbed
Translate error when failing to create order cycle
2018-09-08 02:15:52 +08:00
Maikel
3e0c74494d
Merge pull request #2604 from Matt-Yorkley/pi/updating_variants_bug
...
Pi/updating variants bug
2018-09-07 15:10:18 +10:00
Kristina Lim
a37e9f1b87
Use v0.9.0-20180826174721 in kristinalim fork of angular-foundation
...
There is a bug in the handling of % values for the "top" CSS property of
the modals. See details here:
https://github.com/kristinalim/angular-foundation/pull/1
A PR to the original repository has also been submitted, but the project
doesn't seem to be active anymore:
https://github.com/yalabot/angular-foundation/pull/319
And to another fork of the repository:
https://github.com/cwadrupldijjit/angular-foundation/pull/1
The bug was causing the 10% "top" CSS property for the modal to be
treated as 10px.
2018-09-05 23:58:25 +08:00
luisramos0
89d51d75ae
Merge branch 'master' into 2-0-stable-sept
2018-09-04 17:43:20 +01:00
Kristina Lim
ce0758d420
Add confirm dialog for enterprise image removal
2018-09-04 02:08:26 +08:00
Kristina Lim
368612cad6
Allow removal of enterprise logo and promo image
2018-09-04 02:08:25 +08:00
Kristina Lim
c9370672c6
Add JS support for removal of enterprise images
2018-09-04 02:08:12 +08:00
Matt-Yorkley
d8bbcdc54b
Decrease batch size to reduce chance of timeouts
2018-08-31 22:52:44 +01:00
Matt-Yorkley
04d50d4555
Fix filter results bug in validation section
2018-08-31 15:00:29 +01:00
Kristina Lim
f5c44ef0e6
Rename "entreprise" in i18n keys to "enterprise"
2018-08-31 15:26:30 +08:00
Maikel
1b88edea1f
Merge pull request #2420 from stveep/stripe-admin-2
...
Stripe admin 2
2018-08-30 15:48:49 +10:00
Maikel
79f50e0b7b
Merge pull request #2353 from luisramos0/customers_admin_country_state
...
fixed UX problem in the state selector in customers admin
2018-08-28 16:46:00 +10:00
luisramos0
61f69905f8
fixed UX problem in the state selector in customers admin
2018-08-20 20:51:22 +01:00
stveep
286101c934
PR changes: switch syntax for mapCC, remove ng-init
2018-08-19 10:43:53 +01:00
stveep
c0f41b6833
PR changes - erb to haml, don't update en_GB translations
2018-08-19 10:43:53 +01:00
stveep
b3da7049c6
Should not hide post code on admin side as no billing address otherwise
2018-08-19 10:43:53 +01:00
stveep
ff7dc811e9
Add translations for messages and remove old placeholder translation
2018-08-19 10:43:53 +01:00
stveep
f9a221e2ff
add to manifest, tidy up requirements, hide postcode similar to frontend
2018-08-19 10:43:53 +01:00
stveep
a848b9172e
Change name to AdminStripeElements to avoid confusion; add status bar for StatusMessages
2018-08-19 10:43:53 +01:00
stveep
8272aebe29
Add Stripe form and duplicate Stripe Elements in backend Angular app
2018-08-19 10:43:53 +01:00
Kristina Lim
c14e7ea8d5
Allow bulk update of order cycle name
2018-08-16 21:18:24 +08:00
Matt-Yorkley
c8397024e4
Streamline Product Import UX flow
2018-08-03 14:33:35 +10:00
Pau Perez
43bf7293bf
Merge branch 'master' into 2-0-stable
...
* master: (125 commits)
Fix syntax error in GETTING_STARTED.md
Fix syntax error in README.md
Fix link syntax errors in REAME.md and GETTING_STARTED.md
Style recently merged code
Update gem i18n-js to pick up locale changes
Fix embedded shopfront menu responsiveness
Add communications links to README
Fix script/setup by making it less clever
Change import and reset logic to work with first page
Move options to first page
Fix wrong sort predicates in customer index
Reset reverse when clicking another column to sort
Move logic for toggling by column into SortOptions
Generalize sorting through SortOptions service
Remove unused sorting preferences in ColumnsCtrl
Fix frontend sorting in "Bulk Order Management"
Fix frontend sorting in "Customers" index
Change sorting to be done in ascending order first
Wrap rows in customer index with TBODY tag
Update .rubocop_todo.yml
...
2018-07-27 10:21:47 +02:00
Maikel
933ff63de2
Merge pull request #2389 from luisramos0/bulk_prod_edit_fix
...
admin page fetcher is now synchronously fetching all pages before reso…
2018-07-26 14:09:21 +10:00
Maikel
ffd3d28889
Merge pull request #2474 from Matt-Yorkley/pi/import_options
...
PI: import options UI
2018-07-24 10:34:14 +10:00
Matt-Yorkley
67767f86eb
Change import and reset logic to work with first page
2018-07-23 02:07:00 +01:00
Matt-Yorkley
bd200c885b
Move options to first page
2018-07-23 01:46:32 +01:00
Kristina Lim
47608525c6
Reset reverse when clicking another column to sort
2018-07-23 10:33:40 +10:00
Kristina Lim
5179f7fd63
Move logic for toggling by column into SortOptions
2018-07-23 10:33:40 +10:00
Kristina Lim
55d0b1dfc5
Generalize sorting through SortOptions service
2018-07-23 10:33:40 +10:00
Kristina Lim
8b6b694244
Remove unused sorting preferences in ColumnsCtrl
2018-07-23 10:33:40 +10:00
Kristina Lim
2bba72c5a9
Fix frontend sorting in "Bulk Order Management"
2018-07-23 10:33:40 +10:00
Kristina Lim
822b2c929a
Fix frontend sorting in "Customers" index
...
The scope for customersCtrl did not have access to the sorting
preferences stored in the nested ColumnsCtrl scope. To address this,
the page has been changed to use a new set of sorting preferences
declared in the customersCtrl scope itself.
Also, these sorting preferences are now stored in an object. This
enables the parent scope to see changes to the sorting preferences which
are done via the nested ColumnsCtrl scope,
The "Bulk Order Management" page is also affected by the same scoping
issue. Once this page is fixed, we can remove remnants of the sorting
preferences initialized in ColumnsCtrl.
2018-07-23 10:33:39 +10:00
Kristina Lim
9f09861d8b
Change sorting to be done in ascending order first
...
Currently, we always toggle "reverse" when triggering a sort.
If "reverse" is initially set to false, triggering a sort for the first
time then toggles this to true. The effect is that, the first time that
sorting is done, the rows are sorted in reverse order.
This is not intuitive - they should be sorted in ascending order first.
2018-07-23 10:33:39 +10:00
Maikel
1dbd265b30
Merge pull request #2384 from luisramos0/open_new_tab
...
added directive to make links open in new tab by default in textangul…
2018-07-19 09:17:09 +10:00
