Matt-Yorkley
6219b3f0c3
Revert "Revert "Fix JS render-blocking in Darkswarm""
...
This reverts commit ffeca41e
2019-07-10 17:14:08 +01:00
Maikel
ffeca41ef4
Revert "Fix JS render-blocking in Darkswarm"
2019-07-10 10:24:25 +10:00
Matt-Yorkley
fbb97c3db8
Fix JS render-blocking in Darkswarm
2019-07-02 13:43:20 +01:00
luisramos0
729feb16f1
Merge branch 'master' into 2-0-stable-jan-29th
2019-01-29 12:38:34 +00:00
nozakis
972bfd5e62
Fixed bad margins on the account settings error page.
2019-01-19 16:23:13 -06:00
luisramos0
d282823d3a
Fix missing translation in user transaction history
2018-11-18 16:15:35 +00:00
Kristina Lim
fc79aae17c
Translate authorized shops headers in account page
2018-09-08 00:34:47 +08:00
Rob Harrington
d1d9c5a092
Add help button to saved cards list on account page
...
Describes the purpose of the default card
2018-06-22 15:39:47 +10:00
Rob Harrington
7db7084008
Use help-modal to display help text for authorised shops
...
Also updated the text slightly to make it more clear when the purpose of authorised shops are
2018-06-22 15:39:47 +10:00
Rob Harrington
6457a17fde
Add basic view allowing customers to authorise shop use of their credit cards
2018-06-22 15:39:47 +10:00
Rob Harrington
5cbc4cbf30
Use scoped keys for table headers in saved card partial
2018-06-08 15:30:08 +10:00
Rob Harrington
e88e963b4c
Alter cards interface to allow updating of default card
2018-06-08 15:30:07 +10:00
Pierre de Lacroix
669d9c3c66
Fix translations on account page
2017-12-06 15:21:19 +11:00
Rob Harrington
34b109cbb7
Add basic validation to credit card form on account page
2017-09-23 14:58:35 +10:00
Rob Harrington
19213a5ca8
Rearrange new card inputs on account page
2017-09-23 14:58:34 +10:00
Rob Harrington
69385370ee
Initialize Stripe object only if a publishable_key has been defined
2017-09-23 14:58:34 +10:00
Rob Harrington
65ab83a9a5
Move StripeElements element to an AngularJS directive, mount from there
2017-09-23 14:58:34 +10:00
Rob Harrington
746c2ffef9
Add 'publishable_key' property to Stripe module (enables stubbing)
2017-09-23 14:58:34 +10:00
stveep
6690f2e9e7
Restyle add card form
2017-09-23 14:58:34 +10:00
stveep
74a7cb82bc
Modify to use Stripe Elements to manually add cards in Account page. Remove StripeJS service
2017-09-23 14:58:34 +10:00
Rob Harrington
f317cee9e9
Tweak UI for selecting an existing card at Checkout
2017-09-23 14:58:33 +10:00
Rob Harrington
f890927423
Implementing the Stripe Connect feature toggle
2017-09-23 14:58:32 +10:00
Rob Harrington
fdca1f6606
Adding message about having no saved cards to account/cards UI
2017-09-23 14:58:32 +10:00
Rob Harrington
63a15ec392
CreditCardController#destroy redirects to account#/cards
2017-09-23 14:58:32 +10:00
Rob Harrington
fb5784fbda
Allow updating of account settings from account tabs interface
2017-09-23 14:58:32 +10:00
Rob Harrington
4ef97aa418
Showing past orders under the orders tab
2017-09-23 14:58:32 +10:00
Rob Harrington
b9d72ce4cf
Refactoring logic for displaying orders on the front-end account page
2017-09-23 14:58:32 +10:00
Rob Harrington
9733bb3a77
Renaming account#history to account#transactions
2017-09-23 14:58:32 +10:00
Rob Harrington
532dc57725
Adding translations for /account tabs
2017-09-23 14:58:32 +10:00
Rob Harrington
f4c3fbf8bc
Refactoring credit cards interface, and backend logic
2017-09-23 14:58:32 +10:00
Rob Harrington
778526af2e
Rewriting styling for new tabs components
2017-09-23 14:58:32 +10:00
Rob Harrington
1aebee0583
WIP: rebuilding accounts page using tabs infrastructure
2017-09-23 14:58:32 +10:00
stveep
25f48d944c
Add delete links, tidy up UI a bit (WIP), page refresh after adding still doesn't work
2017-09-23 14:58:31 +10:00
stveep
1449169b16
Basic UI for adding credit card details and getting a Stripe token without making a payment
2017-09-23 14:58:31 +10:00
Rob Harrington
08e391856c
Ask user to confirm cancellation of order
2017-05-05 15:17:14 +10:00
Rob Harrington
316b0915e4
Just display the date that orders can be changed until
...
No fancy moment.js stuff
2017-05-05 14:20:57 +10:00
Rob Harrington
e21bfd95f4
Renaming order.editable? to order.changes_allowed?
2017-05-05 14:20:57 +10:00
Rob Harrington
893331c7bb
Adding 'Open Orders' section to the top of customer accounts page
2017-05-05 14:20:57 +10:00
Rob Harrington
b0ff7ca767
Making accounts page orders listing full-width
2017-05-05 14:19:32 +10:00
Rob Harrington
e5ca494db8
Replacing bindonce with native Angularjs syntax in Darkswarm
...
Involved changing bo-text -> ng-bind, bo-href-i -> ng-href, bo-src-i -> ng-src and ng-html -> ng-bind-html
2016-05-25 08:10:20 +10:00
Steve Pettitt
fc719230a3
Add failed payments, update spec
2016-04-15 08:26:12 +01:00
Steve Pettitt
1483023769
Add a sweet warning sign
2016-04-10 22:48:38 +01:00
Steve Pettitt
bc048a943c
Show all payments, format unsuccessful payments grey, add 'invalid' translation.
2016-04-10 22:23:39 +01:00
stveep
d67db76b88
Formatting credit/debit green/red
2016-03-28 20:35:14 +01:00
Steve Pettitt
e81ef564e3
Capitalize Spree state translations
2016-03-11 22:01:09 +00:00
Maikel Linke
d925c2aefc
Translate Spree payment, shipment and order states
...
- Copied translations for payment_states, shipment_states and order_states
into locale en.yml.
- Enabled global Javascript function `translate` to deal with scopes like
'spree.shipment_states'.
- Removed `humanize` call from order serializer and added translation
scopes to accounts page.
- Test OrderSerializer for untranslated attributes
- Require spec helper in serializer specs
2016-03-09 14:29:54 +11:00
Steve Pettitt
c07fefde1a
Change non-js translations to be done in rails
2016-02-24 20:23:13 +00:00
Steve Pettitt
f7387048b0
Remove cruft and 2nd active table, to stop constant hover
2016-02-21 12:40:53 +00:00
Steve Pettitt
d39b62aa31
Fallback to a default tractor logo if missing
2016-02-20 19:00:37 +00:00
Steve Pettitt
23e774bede
Styling, fewer columns in small/medium screen, logo resize
2016-02-20 17:20:43 +00:00
