Commit Graph

53 Commits (e4a34b543995e151b844d9dcb07110308d8919da)

Author SHA1 Message Date
Mark Moffat 5f81173919 Refactor the pagination data retrieval 2020-03-19 17:02:22 +10:30
Mark Moffat 78e06e511b
Customer account page (#124)
* Adding customer login & account page support

* Added account link

* Sorting orders on account page

* Small UI fixes

* Removed debugs

* Added tests

Co-authored-by: Mark Moffat <mark@Marks-MacBook-Pro-2.local>
2020-03-17 16:56:04 +10:30
Mark Moffat 4f68edb3c7 Linting 2020-03-14 11:27:09 +10:30
geco 7c7af39f4b
Add Bitcoin payment method (#121)
* fix settins form submit not working

* prepare routes/config structure to support new blockonomics payment method

* setup blockonomics view, get address and calculate btc

* blockonomics subscribe to web socket to listen for real time order updates on checkout page

* create order with pending status while waiting for blockonomics payment and pass orderid to frontend

* check received amount is enough

* blockonomics btc amount check, backend order confirmation, show order info into backend and frontend

* cleanup and empty cart when order is payed

* decline order if insufficient amount

* handle email and lunr indexing for blockonomis

* blockonomics new confirmation page, auto redirect at confirmation zero, 10 minutes timeout

* Update README with Blockonomics

* add countdown timer to blockonomics payment page

* updated README and checkout page

* update README with blockonomics return url

* build

* reply to blockonomics http callback

* dont check amount on frontend

* restore default settings

* switch from unirest to axios, remove unirest dep

* fix lint problems

* restore gitignore

* restore baseSchema

* build

Co-authored-by: GECKO <4787777-geckojs@users.noreply.gitlab.com>
2020-03-14 11:21:26 +10:30
Mark Moffat f3a7231016 Added customer company name for shipping 2020-03-07 20:07:49 +10:30
Mark Moffat 8c92d3ca33 Linting 2020-02-01 17:30:05 +10:30
Mark Moffat 6825ea3305 Huge overhaul of admin UI 2020-02-01 17:29:30 +10:30
Mark Moffat 5d4c469e38 Fixed same product - diff opts in cart. Added confirm on cart empty. 2020-01-21 20:30:52 +10:30
Mark Moffat 799ed301f2
Adding discount code support (#109)
Added a discount code module. Lots of work went into this. 

Please report any problems as issues to be fixed
2020-01-21 18:06:46 +10:30
Mark Moffat fb6fb6e3e0 Validate quantity inputs 2020-01-08 19:42:32 +10:30
Mark Moffat 7f750b4a3b Fix validating quantity 2020-01-07 21:33:35 +10:30
Mark Moffat c4ffdff19e Fixed padding issues on cart 2020-01-07 12:04:22 +10:30
Mark Moffat 748c41de64 Fixed not updating cart count on empty 2020-01-05 08:45:28 +10:30
Mark Moffat 0fcbfdcc33 Cart dIsplay fixes for desktop and mobile 2020-01-04 21:34:42 +10:30
Mark Moffat c73d67b923 Fixed display of shipping message 2020-01-04 17:56:30 +10:30
Mark Moffat 11302e2255 Improvements to the shipping module & cart updates 2020-01-04 17:40:58 +10:30
Mark Moffat 3373a60d8f Add/Update/Remove/empty cart without refreshing the page 2020-01-04 13:07:35 +10:30
Mark Moffat c92e89fff2 Removed debug 2020-01-02 15:53:55 +10:30
Mark Moffat 18b8eaf8f5 Fixing the product options 2020-01-02 14:07:36 +10:30
Mark Moffat 03573129b3 Fixing cart storage and management 2019-12-30 13:40:57 +10:30
Mark Moffat 32ea7da4da Huge rewrite and update of style/layout + theme simplification 2019-12-26 13:53:21 +10:30
Mark Moffat b48b2237ee Improving checkout experience Fixes #103 2019-12-21 13:16:48 +10:30
Mark Moffat 588fdddb75 Fixed updating of cart + added retrieval of cart & specs 2019-12-20 09:38:46 +10:30
Mark Moffat ddf78c1618 Add country select for customer form & handle customer register fix 2019-12-19 15:35:48 +10:30
Mark Moffat fd61127ec5 Moved theme JS to own file, serve min theme css, mono css bump 2019-12-19 14:45:28 +10:30
Mark Moffat c992673bc6 Added rate limiter on customer forgotten password 2019-12-16 17:03:51 +10:30
Mark Moffat 1f84f77089 Fixed user create and update API endpoints 2019-12-16 14:52:27 +10:30
Mark Moffat f0a5de3381 Started splitting up public js files 2019-12-06 17:39:13 +10:30
Mark Moffat 67eb6c9014 Allow deleting of customers 2019-11-23 09:05:19 +10:30
Mark Moffat c3c29d04f1
Adding Adyen payment integration (#97)
Add Adyen payment integration
2019-11-11 18:17:48 +10:30
Mark Moffat a87d2fbf0a
Adding subscriptions (#95)
* Adding subscriptions

* Adding in ability to use webhook for subscriptions

* Add docs and ability to create subscriptions

* Fixed populating value

* Adding subscription tests

* Language update
2019-11-06 21:10:27 +10:30
Mark Moffat c97313d9cf Stripe fixes 2019-11-03 17:41:37 +10:30
Mark Moffat 2055f74278 Fixes to option editing 2019-10-26 11:39:10 +10:30
Mark Moffat fc1580ddd6 Starting to add schema validation to API endpoints 2019-06-17 19:51:45 +09:30
Mark Moffat 291a044d0b Linting and refactoring 2019-06-15 14:16:08 +09:30
Mark Moffat da38fb6076 Generate API keys in admin UI 2019-06-15 10:24:41 +09:30
Mark Moffat 1c741eb615 Linting 2019-06-11 14:43:20 +09:30
Mark Moffat 52828cbd40 Fixes #37 2019-02-10 14:16:42 +10:30
Mark Moffat 3ab76684bb Stock management changes 2019-02-09 21:16:41 +10:30
Mark Moffat a03f1ef6e7 Merge branch 'master' of https://github.com/mrvautin/expressCart 2019-02-09 13:36:12 +10:30
Mark Moffat 53df3db937 Added form PR #41 2019-02-09 13:35:41 +10:30
Asad Akram 4739b59c1f in cart; on product quantity update, change the value too. 2019-02-09 13:33:06 +10:30
Mark Moffat 9d94ea0a80 Added ability to add comments to product in order 2018-10-05 21:24:42 +09:30
Mark Moffat c674f86576 Small cart quantity fixes 2018-05-21 23:06:12 +09:30
Mark Moffat fa660edb0c Test fixes 2018-02-23 20:28:05 +01:00
Mark Moffat 61c59c8997 Started adding some tests 2018-02-22 18:41:24 +01:00
Mark Moffat 963a720c6f Small fixes 2018-02-13 21:22:12 +01:00
Mark Moffat 4533e23993 Added permission validation to non admin users 2018-02-05 20:51:04 +01:00
Mark Moffat 2f9911fd1e Change to bcryptjs, small refactor 2018-02-04 13:04:32 +01:00
Mark Moffat 43857f9b07 Fix items not removing from cart 2018-02-03 20:14:13 +01:00