From b54f95fead7adafe6d06f5747bc5ba52d774c8f8 Mon Sep 17 00:00:00 2001 From: Stephane Jolicoeur Date: Wed, 22 Jul 2015 13:57:05 -0700 Subject: [PATCH 1/4] to have the test running --- setup.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/setup.py b/setup.py index 24ac4f9..269b4fc 100644 --- a/setup.py +++ b/setup.py @@ -35,4 +35,7 @@ 'Programming Language :: Python :: 2', 'Programming Language :: Python :: 2.7', 'Topic :: Other/Nonlisted Topic'], + test_suite="tests.tests", + tests_require=["mock==0.8.0"], + test_loader="unittest:TestLoader" ) From 2bfdd0a0e30580cfa4d84f950e3f01c7b6d0719f Mon Sep 17 00:00:00 2001 From: Paul Dufour Date: Wed, 22 Jul 2015 14:04:47 -0700 Subject: [PATCH 2/4] add circle file --- circle.yml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 circle.yml diff --git a/circle.yml b/circle.yml new file mode 100644 index 0000000..432dae4 --- /dev/null +++ b/circle.yml @@ -0,0 +1,3 @@ +machine: + timezone: + America/Los_Angeles From 864ac7a756ed4430b6618757347ea297312ecfa1 Mon Sep 17 00:00:00 2001 From: Paul Dufour Date: Wed, 22 Jul 2015 14:08:22 -0700 Subject: [PATCH 3/4] test commit --- README.rst | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/README.rst b/README.rst index a920b47..89d54a8 100644 --- a/README.rst +++ b/README.rst @@ -10,14 +10,14 @@ This package provides integration between `django-oscar`_ and `Amazon Payments ( Tested with **Python 2.7**, **Django 1.5** and **django-oscar 0.6**. Setup ------ +------ Follow the instructions on configuring your website for Login and Pay with Amazon under http://docs.developer.amazonservices.com/en_US/apa_guide/APAGuide_GettingStarted.html. Note that the website setup requires the "Allowed JavaScript origin" to be a HTTPS URL, so you won't be able to test Amazon Payments integration with a site run using the Django runserver command. -You will also need an Amazon MWS API key and secret key. These are used to +You will also need an Amazon MWS API key and secret key. These are used to interact with the Amazon MWS Off-Amazon Payments API to actually process the payments. See http://docs.developer.amazonservices.com/en_US/off_amazon_payments/OffAmazonPayments_Overview.html @@ -40,7 +40,7 @@ Sandbox site The sandbox site demonstrates how you can set up 2 different Amazon Payments checkout procedures: -1. **One-step checkout**: User selects the shipping address and payment method +1. **One-step checkout**: User selects the shipping address and payment method in one step. Clicking the "Place order" button will immediately attempt to charge the user's Amazon account and takes them to the confirmation / thank you page if successful. Assumes there is one shipping method. @@ -50,12 +50,12 @@ Automatic Payments ------------------ From http://docs.developer.amazonservices.com/en_US/pay_with_amazon_automatic_payments/APAGuide_Introduction.html: -*With the automatic payments feature, buyers can pre-authorize payments for -future purchases. This enables you to charge a buyer’s Amazon Payments account -on a regular basis for subscriptions and usage based billing without requiring +*With the automatic payments feature, buyers can pre-authorize payments for +future purchases. This enables you to charge a buyer’s Amazon Payments account +on a regular basis for subscriptions and usage based billing without requiring the buyer to authorize a payment each time.* -Automatic payments are disabled by default. To enable such payments, override -the Basket model in your oscar project to add a "has_subscriptions" property +Automatic payments are disabled by default. To enable such payments, override +the Basket model in your oscar project to add a "has_subscriptions" property that returns True where appropriate. This has been done in the sandbox site, so you will see the "Automatic payments" widget during checkout. From 7c68d9508c32f9394e0a24d42c2a0b46e35bf5be Mon Sep 17 00:00:00 2001 From: Paul Dufour Date: Wed, 22 Jul 2015 14:12:00 -0700 Subject: [PATCH 4/4] Add circle badge --- README.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.rst b/README.rst index 89d54a8..25989dc 100644 --- a/README.rst +++ b/README.rst @@ -2,6 +2,8 @@ An Amazon Payments package for django-oscar =========================================== +.. image:: https://circleci.com/gh/britco/django-oscar-amazon-payments.svg?style=svg + This package provides integration between `django-oscar`_ and `Amazon Payments (Login and Pay with Amazon)`_. .. _django-oscar: https://github.com/django-oscar/django-oscar