Matt-Yorkley
c8397024e4
Streamline Product Import UX flow
2018-08-03 14:33:35 +10:00
Maikel
02331221ef
Merge pull request #2471 from Matt-Yorkley/pi/post_save
...
PI: post-save UI changes
2018-07-26 11:26:51 +10:00
Maikel Linke
2ceb969925
Style recently merged code
...
We enabled more Rubocop checks and code that was merged around the same
time, didn't comply with the new checks.
2018-07-26 10:52:56 +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
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
Maikel
12838ba61e
Merge pull request #2468 from mkllnk/improve-testing-embedded-pages
...
Improve testing embedded pages
2018-07-23 08:59:11 +10:00
Maikel
add250b30f
Merge pull request #2473 from Matt-Yorkley/pi/stop_if_invalid
...
PI: Don't allow save if invalid entries are present
2018-07-23 08:54:01 +10:00
Maikel Linke
962c54b606
Remove unnecessary expectation
...
The `iframe` is rendered in pure HTML and should always be there.
2018-07-19 10:45:33 +10:00
Maikel Linke
8a3a617870
DRY specs with new EmbeddedPagesHelper
2018-07-19 10:44:43 +10:00
Pau Pérez Fabregat
4f215da735
Merge pull request #2467 from mkllnk/ci-output-test
...
Use progress formatter on Travis to avoid timeout
2018-07-18 19:19:40 +02:00
Pau Pérez Fabregat
fac8e26d8b
Merge pull request #2475 from Matt-Yorkley/pi/landing_page
...
PI: landing page
2018-07-18 16:47:17 +02:00
Matt-Yorkley
c7deae4253
Remove category field from inventory specs
2018-07-18 12:59:19 +01:00
Matt-Yorkley
b37bea35fa
Use relative translation keys
2018-07-18 11:43:31 +01:00
Pau Pérez Fabregat
7bf27ec6b3
Merge pull request #2409 from mkllnk/2013-remove-scope-active_distributors
...
2013 Remove dead code for Spree upgrade
2018-07-18 10:38:19 +02:00
Kristina Lim
c16f4203f9
Rename enterprise "Relationships" to "Permissions"
...
This only updates en* translations, and does not affect URLs and other
back-end references.
2018-07-17 16:03:48 +10:00
luisramos0
4a44454210
fixed number rounding issue in product bulk edit
2018-07-16 13:13:58 +10:00
Matt-Yorkley
8aed78b0e6
Don't allow save if invalid entries are present
2018-07-15 10:21:36 +01:00
Matt-Yorkley
a4210a1cab
PI post-save UI changes
2018-07-15 00:27:21 +01:00
Maikel Linke
622517501c
Make spec robust on slow computers
...
This spec just failed in an unrelated pull request.
https://travis-ci.org/openfoodfoundation/openfoodnetwork/jobs/403435522
This change should fix it even on very slow computers.
2018-07-13 19:10:06 +10:00
Maikel Linke
599f1a966b
Use embedded shops example for tests
2018-07-13 16:36:19 +10:00
Maikel Linke
66980b247a
Fix test of opening shops in new windows
...
The test case had some hard-coded enterprise name that didn't match
anything. It then confirmed that all found links (none) would open a new
window. So it wasn't confirming anything.
2018-07-13 15:37:19 +10:00
Maikel Linke
6f737d8d1e
Unclutter spec setup
2018-07-13 15:37:19 +10:00
Maikel Linke
ed747ec612
Use embedded groups example for tests
2018-07-13 15:37:19 +10:00
Maikel Linke
185cf9a312
Remove code duplication
2018-07-13 15:37:18 +10:00
Maikel Linke
d5d1eae715
Improve spec description
2018-07-13 09:04:42 +10:00
Maikel Linke
43883d1ab4
Simplify email confirmation directive
...
Making better use of Angular features.
Adding a spec for this functionality.
2018-07-13 09:04:42 +10:00
Maikel Linke
6a58deb436
Add message about unconfirmed email to user form
2018-07-13 09:04:41 +10:00
Maikel Linke
97d1b5d7fe
Add spec for creating users
2018-07-13 09:04:40 +10:00
Maikel Linke
b478ef9fd0
Make admin serialiser specs runnable on their own
2018-07-10 09:59:00 +10:00
Rob Harrington
3dacd06b6b
Reload order before sending emails to ensure state is up to date
2018-07-05 19:26:12 +10:00
Rob Harrington
0afa9fae8e
Check authorisation before attempting to charge credit cards on order cycle close
2018-07-05 19:26:12 +10:00
Rob Harrington
a902af42a3
Update attribute that errors are added to from credit_card to payment_method
2018-07-05 19:26:12 +10:00
Rob Harrington
edde929ced
Replace uses of #stub with #allow in Admin::CustomersController
2018-07-05 19:26:12 +10:00
Rob Harrington
4863f2b5b4
Remove unrequired credit_card_id field from subscriptions table
2018-07-05 19:26:12 +10:00
Rob Harrington
21c3f7d21c
Remove unrequired #cards and #addresses actions from Admin::CustomerController
2018-07-05 19:26:12 +10:00
Rob Harrington
e0d46aa105
Add new serializer to allow search for customer addresses
2018-07-05 19:26:12 +10:00
Rob Harrington
c71a5ec0df
Update subscription form to use new card validations for Stripe payment method
2018-07-05 19:26:11 +10:00
Rob Harrington
21c24eb69b
Validate presence and auth of default card for customer
2018-07-05 19:26:11 +10:00
Rob Harrington
cf8ca1f8c1
Add show action to Admin::CustomersController
2018-07-05 19:26:11 +10:00
Rob Harrington
45895e9924
Use the user's default card to pay for subcriptions
2018-07-05 19:26:11 +10:00
Rob Harrington
fc2844a3d5
Add default_card method to user model
2018-07-05 19:26:11 +10:00
Frank West
09534b41e9
Remove taxon when primary taxon is changed
...
We are adding taxons to the product as you change the primary taxon.
However we never remove the previous primary taxon so it forces the user
to update the taxons manually. This can be a big problem if you are bulk
updating products.
We now remove the taxon that matches the previously set primary taxon.
2018-07-04 09:16:50 +10:00
Rob Harrington
2da6234362
Add spec for StripeGateway#refund
2018-07-03 14:21:58 +10:00
Rob Harrington
c496d0f14d
Allow credit owed on payments made via stripe to be refunded via the admin section
2018-07-03 14:21:58 +10:00
