Skip to content

Commit

Permalink
Some editing
Browse files Browse the repository at this point in the history
  • Loading branch information
Martijn Jacobs committed Jan 6, 2016
1 parent f16a06f commit 7982f78
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
7 changes: 2 additions & 5 deletions docs/source/usage/communicate_with_the_api.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
=============
Example Usage
=============
When you browse through the API (see also the ":ref:`django-oscar-sandbox`" section), most of the things are already pretty clear in terms how you can communicate with the API. In the following examples we use the python `requests`_ package to demonstate how the API works.
When you browse through the API (see also the :ref:`django-oscar-sandbox` section), most of the things are already pretty clear in terms how you can communicate with the API. In the following examples we use the python `requests`_ package to demonstate how the API works.

.. _`requests`: http://docs.python-requests.org/

Expand Down Expand Up @@ -259,10 +259,7 @@ When your basket is filled an you want to proceed to checkout you can do a singl
}
.. note::
After you placed an order with the api, the basket is frozen. Oscar API has checks for this in the checkout view and won't let you checkout the same (or any frozen) basket again. At this stage an order is submitted in Oscar and you will have to implement the following steps regarding payment yourself. See also the ``payment_url`` field above in the response.

.. caution::
Explain the payment_url a bit more and add a login example.
After you placed an order with the api, the basket is frozen. Oscar API has checks for this in the checkout view and won't let you checkout the same (or any frozen) basket again. At this stage an order is submitted in Oscar and you will have to implement the following steps regarding payment yourself. See the ``payment_url`` field above in the response. You can also use the regular Oscar checkout views if you like, take a look at the :ref:`mixed-usage-label` section.

.. _login-user-label:

Expand Down
4 changes: 3 additions & 1 deletion docs/source/usage/outofthebox.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,11 @@ To use the oscarapi application in an oscar ecommerce site without overriding or
)
.. attention::
Link to the middleware classes and to the settings section
Add Links to the middleware classes and to the settings section.


.. _mixed-usage-label:

Mixed usage
-----------
.. attention::
Expand Down

0 comments on commit 7982f78

Please sign in to comment.