From b0df61f757ab0ce721b9fd9476a99ea9f5f7e633 Mon Sep 17 00:00:00 2001 From: shivam kohli Date: Thu, 2 Aug 2018 05:54:45 +0530 Subject: improved ui by adding explanations --- inventory/forms.py | 2 +- templates/inventory/base1.html | 6 +++--- templates/inventory/digital_inventory.html | 6 +++--- templates/inventory/home.html | 12 ++++++------ templates/inventory/login.html | 2 ++ templates/inventory/new_product.html | 5 +++-- templates/inventory/order.html | 1 + templates/inventory/signup.html | 4 ++++ 8 files changed, 23 insertions(+), 15 deletions(-) diff --git a/inventory/forms.py b/inventory/forms.py index 36653b1..e450a53 100644 --- a/inventory/forms.py +++ b/inventory/forms.py @@ -39,7 +39,7 @@ class SignUpForm(UserCreationForm): last_name = forms.CharField(max_length=30, required=False) email = forms.EmailField(max_length=254) website = forms.URLField(label='Enter website URL', max_length=250, required=False) - address = forms.CharField(label='Payment Address type ', widget=forms.Select(choices=ADDRESS_CHOICES)) + address = forms.CharField(label='Payment Address type', widget=forms.Select(choices=ADDRESS_CHOICES)) pay_url = forms.URLField(label='Directly enter the Plain PaytoURI', max_length=250, required=False) class Meta: diff --git a/templates/inventory/base1.html b/templates/inventory/base1.html index 4c227e9..93d7dec 100644 --- a/templates/inventory/base1.html +++ b/templates/inventory/base1.html @@ -36,9 +36,9 @@ with the Taler Codeless Merchant. If not, see .

Codeless Demo

Merchant

Codeless is a platform for the merchant where they can manage their inventory and simultaneously create a 'Buy Now' button for the specific product. This code can be directly copy pasted on the seller's frontend and can be used for 'Pay with Taler'.

-
  • LOGIN
    • -
  • REGISTER
    • -
  • FORGET PASSWORD
    • +
  • Login
    • +
  • Register
    • +
  • Forget Password

    • You can learn more about Taler on our main website.

    diff --git a/templates/inventory/digital_inventory.html b/templates/inventory/digital_inventory.html index 078233c..a3e92fe 100644 --- a/templates/inventory/digital_inventory.html +++ b/templates/inventory/digital_inventory.html @@ -21,16 +21,16 @@ with the Taler Codeless Merchant. If not, see . {% extends "inventory/base2.html" %} {% block headermsg %} -

    ADD A NEW PRODUCT

    +

    ADD A NEW DIGITAL PRODUCT

    +

    Upload Digital Inventory (like a PDF or html page) via the codeless payments frontend, and the user can then purchase it and view the version hosted by the codeless payment frontend. A large number of uploading format is accepted.

    {% endblock headermsg %} {% block content %} -
    +
    -

    FOR DIGITAL INVENTORY

    {% csrf_token %} diff --git a/templates/inventory/home.html b/templates/inventory/home.html index 5b5d6b6..f7d2faa 100644 --- a/templates/inventory/home.html +++ b/templates/inventory/home.html @@ -24,11 +24,15 @@ with the Taler Codeless Merchant. If not, see . {% load staticfiles %}

    INVENTORY

    +

    The current products in the inventory available has been displayed below. To add new physical or digital inventory click the buttons respectively below this text. For detailed information about specific product click on the card below (cards are displayed only when there is inventory in the stocks).

    {% endblock headermsg %} {% block content %} -
    - +
    +
      {% for item in data %}
    • @@ -48,9 +52,5 @@ with the Taler Codeless Merchant. If not, see .
      • {% endfor %}
    - -
    ADD PRODUCT

    -
    ADD DIGITAL INVENTORY
    -
    {% endblock content %} \ No newline at end of file diff --git a/templates/inventory/login.html b/templates/inventory/login.html index 0160b15..1220b02 100644 --- a/templates/inventory/login.html +++ b/templates/inventory/login.html @@ -22,6 +22,7 @@ with the Taler Codeless Merchant. If not, see . {% block headermsg %}

    Login

    +

    Login to the codeless payment. A platform for the merchant where they can manage their inventory and create a buy now button for 'Pay with Taler'

    {% endblock headermsg %} {% block content %} @@ -39,5 +40,6 @@ with the Taler Codeless Merchant. If not, see .
    +

    If you are not registered as a merchant, please signup before proceeding. You can signup here.

    {% endblock content %} \ No newline at end of file diff --git a/templates/inventory/new_product.html b/templates/inventory/new_product.html index 9875c4a..c50aaa1 100644 --- a/templates/inventory/new_product.html +++ b/templates/inventory/new_product.html @@ -21,11 +21,12 @@ with the Taler Codeless Merchant. If not, see . {% extends "inventory/base2.html" %} {% block headermsg %} -

    ADD A NEW PRODUCT

    +

    ADD A NEW PHYSICAL INVENTORY

    +

    In this kind of product the seller has a flexibilty to add any product (any phyical inventory). The Minimum Quantity of the Product that is required to be maintained in the stock. Whenever the stocks run below this limit the seller would be notified(Curently this feature has not been added but soon email notification would be added).
    Whenever user purchases a product from the seller, after successful payment they will be redirected to the fullfillment page. On the fullfillment page the user can track his shipment. The status of the order is updated by the merchant and on this basis the user is updated about his shipment on the fullfillment page. For now there are five paramters that have used for tracking.

    {% endblock headermsg %} {% block content %} -
    +
    diff --git a/templates/inventory/order.html b/templates/inventory/order.html index d4a3424..5df03f6 100644 --- a/templates/inventory/order.html +++ b/templates/inventory/order.html @@ -24,6 +24,7 @@ with the Taler Codeless Merchant. If not, see . {% load staticfiles %}

    ORDERS PLACED

    +

    All the pending orders are displayed below. Whenever user purchases a product from the seller, after successful payment they are redirected to the fullfillment page. For digital inventory the fullfillment page would be the direct display of the digital inventory(like pdf). But for physical product shipment tracking makes sence. Therefore on the fullfillment page the user can track his shipment. The status of the order is updated by the merchant and on this basis the user is updated about his shipment of fullfillment page. For now there are five paramters that have used for tracking, but this is extensible and can be modified according to the requirement.

    {% endblock headermsg %} {% block content %} diff --git a/templates/inventory/signup.html b/templates/inventory/signup.html index 7ed3c8c..6dd4fda 100644 --- a/templates/inventory/signup.html +++ b/templates/inventory/signup.html @@ -22,6 +22,7 @@ with the Taler Codeless Merchant. If not, see . {% block headermsg %}

    Register

    +

    Register as a Merchant. If you already registered, please login here.

    {% endblock headermsg %} {% block content %} @@ -36,6 +37,9 @@ with the Taler Codeless Merchant. If not, see . {% if field.label == 'Directly enter the Plain PaytoURI' %}

    {{ field }} + {% elif field.label == 'Payment Address type' %} +

    + {{ field }} {% else %} {{ field }} -- cgit v1.2.3