1. Kai Diefenbach
  2. django-lfs

Commits

Kai Diefenbach  committed 240d6d4 Merge

Merged 0.7 branch.

  • Participants
  • Parent commits a5441e7, 4ce1cd9
  • Branches default

Comments (0)

Files changed (4)

File README.txt

View file
 Changes
 =======
 
+Unreleased
+----------
+
+* Bugfix: removed typo; issue #163 (Frank Feng)
+* Bugfix: fixed accessories tab in manage; #issue #162 (Frank Feng)
+* Bugfix: get_base_price_net; #issue #161
+* Bugfix: display only parent's active base price value for variants
+* Bugfix: take the parent's price calculator for variants
+* Added: default footer for email messages (Maciej Wiśniowski)
+* Improved: email templates (Maciej Wiśniowski)
+* Updated: German translations
+
 0.7.0 beta 3
 ------------
 

File docs/introduction/getting_started.rst

View file
 
 #. Browse http://localhost:8000/manage.
 
-#. Login, if your aren't yet.
+#. Login, if you aren't yet.
 
 #. Browse to ``Shop / Preferences``.
 
 #. Enter ``Notification E-Mail Addresses``. To this addresses all notification
    messages will be sent. For example, if an order has been submitted.
 
+#. Click on the ``Save Shop`` button.
+
 #. Go to the ``Default Values`` tab.
 
-#. Select the default ``Price Type``. This is the default for all products, if
-   the price type is not explicitly selected on a product.
+#. Select the default ``Price Calculator:``. This is the default for all
+   products, if the price calculator is not explicitly selected on a product.
 
 #. Select ``Invoice Countries`` and ``Shipping Countries``. All selected
    countries will be available to the shop customers for selection.
 #. Select ``Default Country``. This country will be preselected as default
    country.
 
+#. Click on the ``Save Default Values`` button.
+
 Add Product Taxes
 =================
 
-#. Go to ``Shop / Product Taxes``. As there are no taxes yet, you are redirected
-   automatically to the  form.
+#. Go to ``Shop / Product Taxes`` and click on the ``Add Product Tax`` button.
 
 #. Enter the ``Rate`` (in percentage), for instance 19.0.
 
-#. Click on ``Add Tax`` button.
+#. Click on the ``Add Tax`` button.
 
 #. You can add more taxes by clicking on the ``Add Product Tax`` site action
    and executing steps 2 to 3.
 Add Delivery Times
 ==================
 
-#. Go to ``Shop / Delivery Times``. As there are no delivery times yet, your are
-   redirected automatically to the add form.
+#. Go to ``Shop / Delivery Times`` and click on the ``Add Delivery Time``
+   button.
 
 #. Enter ``Min``, the minimal delivery time.
 
 
 #. Enter the ``Unit`` of this delivery time.
 
-#. Enter the ``Description``. This is just for internal purposes.
-
-#. Click on ``Add delivery time`` button.
+#. Click on the ``Add Delivery Time`` button.
 
 #. You can add more delivery times by clicking on ``Add delivery time`` link and
-   executing steps 2 to 4.
+   executing steps 2 to 3.
 
 Add Categories
 ==============
 
 #. Now go to ``Catalog / Categories``.
 
-#. Click on ``Add Category``.
+#. Click on the ``Add Category`` button.
 
 #. Enter a ``name`` and a ``slug``.
 
 #. Enter a ``Description``. This will be displayed within the detail view of
    a category.
 
+#. Click on the ``Save Data`` button.
+
 #. Go to the ``View`` tab.
 
 #. Select the ``Category Template``, In this case ``Category with Products``
 Add Products
 ============
 
-#. Now go to ``Catalog / Products`` and add a new Product. Since there is no
-   product yet, you will redirected automatically to the add form.
+#. Now go to ``Catalog / Products`` and click on the ``Add Product`` button.
 
 #. Enter ``name`` and a ``slug``.
 
    displayed within a overview, e.g. when a category displays it's assigned
    products.
 
-#. Enter a ``description``. This will be displayed within the detail view of
+#. Enter a ``Description``. This will be displayed within the detail view of
    a product.
 
-#. Click on ``Save Data``.
+#. Click on the ``Save Data`` button.
 
 #. Go to the ``Categories`` tab
 
 
 #. Go to the ``Images`` tab
 
-#. Click ``Select Images``, browse to your images and select all images you want
+#. Click ``Choose Files``, browse to your images and select all images you want
    to upload. You will see an upload indicator and all images will be uploaded.
 
-#. Go back to the ``Product`` tab
+#. Go back to the ``Data`` tab
 
 #. Check the ``Active`` check box. Only active products are displayed to the
    customers.
 
-#. Click ``Save data``.
+#. Click on the ``Save Data`` button.
 
 #. Click on ``Goto Product`` to visit the new product.
 
 
     sudo apt-get install language-support-en
 
+.. Note::
+
+   After you have changed the locale you need to restart your instance to make it
+   active.
 
 What's Next?
 ============

File lfs/static/js/lfs.js

View file
             }
             else {
                 var q = $("#search-input").attr("value");
-                var url = $("#search-input").attr("data");
+                var url = $("#search-input").data("url");
                 $.get(url, {"q" : q}, function(data) {
                     data = $.parseJSON(data);
                     if (data["state"] == "success") {

File lfs/templates/manage/order/orders_inline.html

View file
                 </td>
                 <td class="right-padding">
                     {% if order.message %}
-                        Yes
+                        {% trans "Yes" %}
                     {% else %}
-                        No
+                        {% trans "No" %}
                     {% endif %}
                 </td>
             </tr>