Merge pull request #15 from shawnadelic/0.4.1-changes

Add v0.4.1 changes
shuup · Aug 19, 2016 · 3045a00 · 3045a00
2 parents 29b85e6 + 8221683
commit 3045a00
Show file tree

Hide file tree

Showing 27 changed files with 95 additions and 50 deletions.
diff --git a/source/addons/addons-menu.png b/source/addons/addons-menu.png
diff --git a/source/campaigns/basket-campaigns-menu.png b/source/campaigns/basket-campaigns-menu.png
diff --git a/source/campaigns/coupons-menu.png b/source/campaigns/coupons-menu.png
diff --git a/source/customers-and-users.rst b/source/customers-and-users.rst
@@ -8,7 +8,7 @@ Creating a User
 ^^^^^^^^^^^^^^^
 
 1. Navigate to the Users admin page by clicking `Users` under the
-   `Contacts` category from the Shuup Admin menu.
+   `Settings` category from the Shuup Admin menu.
 
    .. image:: customers-and-users/users-menu.png
 
@@ -63,7 +63,7 @@ Changing User Passwords
 ***********************
 
 1. Navigate to the Users admin page by clicking `Users` under the
-   `Contacts` category from the Shuup Admin menu
+   `Settings` category from the Shuup Admin menu
 
    .. image:: customers-and-users/users-menu.png
 
@@ -85,7 +85,7 @@ Sending Password-Reset Emails
 *****************************
 
 1. Navigate to the Users admin page by clicking `Users` under the
-   `Contacts` category from the Shuup Admin menu.
+   `Settings` category from the Shuup Admin menu.
 
    .. image:: customers-and-users/users-menu.png
 
@@ -111,7 +111,7 @@ Editing User Permissions
    Use caution when granting users administrative permissions.
 
 1. Navigate to the Users admin page by clicking `Users` under the
-   `Contacts` category from the Shuup Admin menu.
+   `Settings` category from the Shuup Admin menu.
 
    .. image:: customers-and-users/users-menu.png
 
@@ -146,7 +146,7 @@ not displayed when first opening the Users admin page.
 To deactivate a user:
 
 1. Navigate to the Users admin page by clicking `Users` under the
-   `Contacts` category from the Shuup Admin menu.
+   `Settings` category from the Shuup Admin menu.
 
    .. image:: customers-and-users/users-menu.png
 
@@ -163,6 +163,35 @@ To deactivate a user:
 
 .. note:: The same steps can be followed to activate a deactivated user.
 
+Logging in as a User
+^^^^^^^^^^^^^^^^^^^^
+
+When troubleshooting a problem for a customer, it may be useful to log
+in under the user's account.
+
+To log in as a user:
+
+1. When logged in as a superuser, navigate to the Users admin page by
+   clicking `Users` under the `Settings` category from the Shuup Admin
+   menu.
+
+   .. image:: customers-and-users/users-menu.png
+
+2. Select the user you want to log in as.
+
+   .. image:: customers-and-users/select-user.png
+
+3. Click the `Login as User` button on the user admin toolbar.
+
+   .. image:: customers-and-users/login-as-user-button.png
+
+4. You will now be logged in as the user.
+
+.. note::
+
+   If a superuser places an order as another user, the superuser will be
+   listed as the creator on the orders details page.
+
 Permission Groups
 ~~~~~~~~~~~~~~~~~
 
@@ -306,7 +335,7 @@ Creating a Contact From a User Account
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 1. Navigate to the Users admin page by clicking `Users` under the
-   `Contacts` category from the Shuup Admin menu.
+   `Settings` category from the Shuup Admin menu.
 
    .. image:: customers-and-users/users-menu.png
 

diff --git a/source/customers-and-users/contact-groups-menu.png b/source/customers-and-users/contact-groups-menu.png
diff --git a/source/customers-and-users/contacts-menu.png b/source/customers-and-users/contacts-menu.png
diff --git a/source/customers-and-users/login-as-user-button.png b/source/customers-and-users/login-as-user-button.png
diff --git a/source/customers-and-users/permission-groups-menu.png b/source/customers-and-users/permission-groups-menu.png
diff --git a/source/customers-and-users/users-menu.png b/source/customers-and-users/users-menu.png
diff --git a/source/orders.rst b/source/orders.rst
@@ -9,8 +9,8 @@ front or by a merchant through the Shuup Admin.
 
 To create an order through the Shuup Admin:
 
-1. Navigate to the Orders admin page by clicking `Orders` from the Shuup
-   Admin menu.
+1. Navigate to the Orders admin page by clicking `Orders` under the
+   `Orders` category from the Shuup Admin menu.
 
    .. image:: orders/orders-menu.png
 
@@ -45,12 +45,25 @@ To create an order through the Shuup Admin:
    Text/Comment line
       A non-priced text line
 
-5. Select shipping and payment methods for the order from the Shipping
+5. Optionally, the `Quick add product line` form can be used to quickly
+   add product lines to the order. For example, this can be used when
+   adding products using a barcode scanning device.
+
+   To quick add products:
+
+   a. Enter a product name, sku, or barcode number and select desired
+      product from the dropdown results.
+   b. Press the plus button to add the product line to order, or press
+      the trash button to clear the input and select a new product.
+
+      .. image:: orders/quick-add.png
+
+6. Select shipping and payment methods for the order from the Shipping
    and Payment Methods dropdowns.
 
    .. image:: orders/shipping-and-payment-methods.png
 
-6. Click the `Proceed` button to create the order.
+7. Click the `Proceed` button to create the order.
 
    .. image:: orders/proceed-button.png
 
@@ -64,8 +77,8 @@ To create an order through the Shuup Admin:
 Editing an Order
 ~~~~~~~~~~~~~~~~
 
-1. Navigate to the Orders admin page by clicking `Orders` from the
-   Shuup Admin menu.
+1. Navigate to the Orders admin page by clicking `Orders` under the
+   `Orders` category from the Shuup Admin menu.
 
    .. image:: orders/orders-menu.png
 
@@ -95,8 +108,8 @@ Creating an Order Shipment
 
 To create an order shipment:
 
-1. Navigate to the Orders admin page by clicking `Orders` from the
-   Shuup Admin menu.
+1. Navigate to the Orders admin page by clicking `Orders` under the
+   `Orders` category from the Shuup Admin menu.
 
    .. image:: orders/orders-menu.png
 
@@ -126,8 +139,8 @@ Printing a Delivery Slip
 
 To print a delivery slip for an order shipment:
 
-1. Navigate to the Orders admin page by clicking `Orders` from the
-   Shuup Admin menu.
+1. Navigate to the Orders admin page by clicking `Orders` under the
+   `Orders` category from the Shuup Admin menu.
 
    .. image:: orders/orders-menu.png
 
@@ -160,8 +173,8 @@ Viewing Order Payments
 
 To view all payments for an order:
 
-1. Navigate to the Orders admin page by clicking `Orders` from the
-   Shuup Admin menu.
+1. Navigate to the Orders admin page by clicking `Orders` under the
+   `Orders` category from the Shuup Admin menu.
 
    .. image:: orders/orders-menu.png
 
@@ -182,8 +195,8 @@ Creating an Order Payment
 
 To create an order payment:
 
-1. Navigate to the Orders admin page by clicking `Orders` from the
-   Shuup Admin menu.
+1. Navigate to the Orders admin page by clicking `Orders` under the
+   `Orders` category from the Shuup Admin menu.
 
    .. image:: orders/orders-menu.png
 
@@ -229,8 +242,8 @@ Creating a Partial Refund
 To create a partial refund for a particular amount or to refund
 particular order line amounts:
 
-1. Navigate to the Orders admin page by clicking `Orders` from the
-   Shuup Admin menu.
+1. Navigate to the Orders admin page by clicking `Orders` under the
+   `Orders` category from the Shuup Admin menu.
 
    .. image:: orders/orders-menu.png
 
@@ -267,8 +280,8 @@ Creating a Full Refund
 
 To create a full refund for an order:
 
-1. Navigate to the Orders admin page by clicking `Orders` from the
-   Shuup Admin menu.
+1. Navigate to the Orders admin page by clicking `Orders` under the
+   `Orders` category from the Shuup Admin menu.
 
    .. image:: orders/orders-menu.png
 
@@ -303,8 +316,8 @@ Canceling an Order
 
 To cancel an order:
 
-1. Navigate to the Orders admin page by clicking `Orders` from the
-   Shuup Admin menu.
+1. Navigate to the Orders admin page by clicking `Orders` under the
+   `Orders` category from the Shuup Admin menu.
 
    .. image:: orders/orders-menu.png
 
@@ -324,8 +337,8 @@ Once an order has been shipping, it can be marked as completed.
 
 To set an order as complete:
 
-1. Navigate to the Orders admin page by clicking `Orders` from the
-   Shuup Admin menu.
+1. Navigate to the Orders admin page by clicking `Orders` under the
+   `Orders` category from the Shuup Admin menu.
 
    .. image:: orders/orders-menu.png
 
@@ -347,8 +360,8 @@ The order will now be marked as `completed`.
 Printing an Order Confirmation
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-1. Navigate to the Orders admin page by clicking `Orders` from the
-   Shuup Admin menu.
+1. Navigate to the Orders admin page by clicking `Orders` under the 
+   `Orders` category from the Shuup Admin menu.
 
    .. image:: orders/orders-menu.png
 

diff --git a/source/orders/orders-menu.png b/source/orders/orders-menu.png
diff --git a/source/orders/quick-add.png b/source/orders/quick-add.png
diff --git a/source/payment-and-shipping.rst b/source/payment-and-shipping.rst
@@ -13,8 +13,7 @@ Creating a Payment/Service Provider
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 1. Navigate to the Service Providers admin page by clicking `Service
-   Providers` under the `Payment and Shipping` category from the Shuup
-   Admin menu.
+   Providers` under the `Settings` category from the Shuup Admin menu.
 
    .. image:: payment-and-shipping/service-providers-menu.png
 
@@ -53,7 +52,7 @@ Creating a Payment Method
 ^^^^^^^^^^^^^^^^^^^^^^^^^
 
 1. Navigate to the Payment Method admin by clicking `Payment Methods`
-   under the `Payment and Shipping` category from the Shuup Admin menu.
+   under the `Settings` category from the Shuup Admin menu.
 
    .. image:: payment-and-shipping/payment-methods-menu.png
 
@@ -80,7 +79,7 @@ Creating a Shipping Method
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 1. Navigate to the Shipping Method admin by clicking `Shipping Methods`
-   under the `Payment and Shipping` category from the Shuup Admin menu.
+   under the `Settings` category from the Shuup Admin menu.
 
    .. image:: payment-and-shipping/shipping-methods-menu.png
 
@@ -136,8 +135,8 @@ Adding a Behavior Component to a Method
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 1. Navigate to the Shipping or Payment Methods admin by clicking
-   `Shipping Methods` or `Payment Methods` under the `Payment and
-   Shipping` category from the Shuup Admin menu.
+   `Shipping Methods` or `Payment Methods` under the `Settings`
+   category from the Shuup Admin menu.
 
    .. image:: payment-and-shipping/payment-methods-menu.png
 

diff --git a/source/payment-and-shipping/payment-methods-menu.png b/source/payment-and-shipping/payment-methods-menu.png
diff --git a/source/payment-and-shipping/service-providers-menu.png b/source/payment-and-shipping/service-providers-menu.png
diff --git a/source/payment-and-shipping/shipping-methods-menu.png b/source/payment-and-shipping/shipping-methods-menu.png
diff --git a/source/products.rst b/source/products.rst
@@ -12,22 +12,21 @@ menu and select the `Products` section under the `Products` category.
 
 .. image:: products/products-menu.png
 
-On the `Products` page, you will a list of all of the products currently
-in your shop. In the upper right-hand corner, there is a button labelled
-`New product`.
+On the `Products` page, you will see a list of all of the products
+currently in your shop. In the upper right-hand corner there is a
+button labelled `New product` for creating new products. Clicking
+this will take you to the new product form, where you can enter
+information about your new product.
 
 .. image:: products/new-product-button.png
 
 New Product Form
 ~~~~~~~~~~~~~~~~
 
-Clicking this will take you to the `new product form`, where you can enter
-information about your new product.
-
 .. image:: products/new-product-form.png
 
 Like other Shuup Admin forms, required fields are marked with a red
-asterisk and missing or invalid fields will be highlighted red on form
+asterisk and missing or invalid fields will be highlighted red upon form
 submission.
 
 The left side of the form contains a number of sections of the form
@@ -112,6 +111,11 @@ depending on the product's supplier settings.
 
 .. todo:: Add complete reference for product fields
 
+Orders Management Tab
+^^^^^^^^^^^^^^^^^^^^^
+
+Show recent orders containing the product.
+
 Product Types
 -------------
 

diff --git a/source/products/products-menu.png b/source/products/products-menu.png
diff --git a/source/tax-settings.rst b/source/tax-settings.rst
@@ -10,7 +10,7 @@ Creating a New Tax
 To create a new tax:
 
 1. Navigate to the Taxes admin page by clicking `Taxes` under the
-   `Taxes` category from the Shuup Admin menu.
+   `Settings` category from the Shuup Admin menu.
 
    .. image:: tax-settings/taxes-menu.png
 
@@ -32,7 +32,7 @@ Creating a New Tax Rule
 ^^^^^^^^^^^^^^^^^^^^^^^
 
 1. Navigate to the Taxes admin page by clicking `Tax Rules` under the
-   `Taxes` category from the Shuup Admin menu.
+   `Settings` category from the Shuup Admin menu.
 
    .. image:: tax-settings/tax-rules-menu.png
 
@@ -53,7 +53,7 @@ Creating a New Customer Tax Group
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 1. Navigate to the Taxes admin page by clicking `Customer Tax Groups`
-   under the `Taxes` category from the Shuup Admin menu.
+   under the `Settings` category from the Shuup Admin menu.
 
    .. image:: tax-settings/customer-tax-groups-menu.png
 
@@ -75,7 +75,7 @@ Creating a New Tax Class
 ^^^^^^^^^^^^^^^^^^^^^^^^
 
 1. Navigate to the Tax Classes admin page by clicking `Tax Classes`
-   under the `Taxes` category from the Shuup Admin menu.
+   under the `Settings` category from the Shuup Admin menu.
 
    .. image:: tax-settings/tax-classes-menu.png
 
@@ -103,7 +103,7 @@ Shop Settings
    the tax display settings.
 
 1. Navigate to the Shops admin page by clicking `Shops` under the
-   `System` category from the Shuup Admin menu.
+   `Storefront` category from the Shuup Admin menu.
 
    .. image:: tax-settings/shops-menu.png
 

diff --git a/source/tax-settings/contact-groups-menu.png b/source/tax-settings/contact-groups-menu.png
diff --git a/source/tax-settings/customer-tax-groups-menu.png b/source/tax-settings/customer-tax-groups-menu.png
diff --git a/source/tax-settings/shops-menu.png b/source/tax-settings/shops-menu.png
diff --git a/source/tax-settings/tax-classes-menu.png b/source/tax-settings/tax-classes-menu.png
diff --git a/source/tax-settings/tax-rules-menu.png b/source/tax-settings/tax-rules-menu.png
diff --git a/source/tax-settings/taxes-menu.png b/source/tax-settings/taxes-menu.png
diff --git a/source/using-themes.rst b/source/using-themes.rst
@@ -17,8 +17,8 @@ until a theme for the shop has been activated.
 
 .. image:: using-themes/no-theme-selected.png
 
-To active a theme, go to the Shuup Admin and select the `Themes`
-admin from main menu.
+To active a theme, go to the Shuup Admin and click `Themes` under the
+`Storefront` category from the Shuup Admin menu.
 
 .. image:: using-themes/themes-menu.png
 

diff --git a/source/using-themes/themes-menu.png b/source/using-themes/themes-menu.png