Merge pull request #559 from gurch101/add-customer-detail-modal

Add customer detail modal to admin order creator (SHUUP-2725)

doc/changelog.rst

@@ -77,6 +77,7 @@ Localization
 Admin
 ~~~~~
 
+- Add customer detail view to order creator 
 - Define module-level permissions for all admin modules
 - Enable adding of permission groups from `Users` admin
 - Add admin module for managing Django permission groups

shoop/admin/locale/en/LC_MESSAGES/djangojs.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-13 20:20+0000\n"
+"POT-Creation-Date: 2016-06-20 19:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: en <LL@li.org>\n"
@@ -132,6 +132,51 @@ msgstr ""
 msgid "Shipping address"
 msgstr ""
 
+msgid "Full Name"
+msgstr ""
+
+msgid "Phone"
+msgstr ""
+
+msgid "Email"
+msgstr ""
+
+msgid "Groups"
+msgstr ""
+
+msgid "Companies"
+msgstr ""
+
+msgid "Merchant Notes"
+msgstr ""
+
+msgid "Year"
+msgstr ""
+
+msgid "Total Sales"
+msgstr ""
+
+msgid "Shipment Status"
+msgstr ""
+
+msgid "Payment Status"
+msgstr ""
+
+msgid "Order Status"
+msgstr ""
+
+msgid "Customer Information"
+msgstr ""
+
+msgid "Order Summary"
+msgstr ""
+
+msgid "Recent Orders"
+msgstr ""
+
+msgid "Close"
+msgstr ""
+
 msgid "A new customer will be created based on billing address."
 msgstr ""
 
@@ -144,6 +189,9 @@ msgstr ""
 msgid "New Customer"
 msgstr ""
 
+msgid "View Details"
+msgstr ""
+
 msgid "Save customer details while creating order"
 msgstr ""
 
@@ -263,12 +311,6 @@ msgstr ""
 msgid "Tax number"
 msgstr ""
 
-msgid "Phone"
-msgstr ""
-
-msgid "Email"
-msgstr ""
-
 msgid "Street"
 msgstr ""
 
@@ -287,6 +329,9 @@ msgstr ""
 msgid "Country"
 msgstr ""
 
+msgid "No records found."
+msgstr ""
+
 msgid "Identifier"
 msgstr ""
 

shoop/admin/modules/contacts/views/detail.py

@@ -10,14 +10,13 @@
 from django.conf import settings
 from django.contrib import messages
 from django.core.urlresolvers import reverse
-from django.db.models import Q
 from django.http.response import HttpResponseRedirect
 from django.utils.encoding import force_text
 from django.utils.translation import ugettext_lazy as _
 from django.views.generic import DetailView
 
 from shoop.admin.toolbar import PostActionButton, Toolbar, URLActionButton
-from shoop.core.models import CompanyContact, Contact, Order, PersonContact
+from shoop.core.models import CompanyContact, Contact, PersonContact
 from shoop.utils.excs import Problem
 
 
@@ -103,18 +102,12 @@ def get_context_data(self, **kwargs):
         context = super(ContactDetailView, self).get_context_data(**kwargs)
         context["companies"] = []
         if isinstance(self.object, PersonContact):
-            order_q = Q(orderer=self.object) | Q(customer=self.object)
             context["companies"] = sorted(
                 self.object.company_memberships.all(), key=(lambda x: force_text(x))
             )
-        else:
-            order_q = Q(customer=self.object)
-        user = getattr(self.object, "user", None)
-        if user:
-            order_q |= Q(creator=user)
         context["contact_groups"] = sorted(
             self.object.groups.all(), key=(lambda x: force_text(x)))
-        context["orders"] = Order.objects.filter(order_q).order_by("-id")
+        context["orders"] = self.object.customer_orders.order_by("-id")
         context["toolbar"] = ContactDetailToolbar(contact=self.object, request=self.request)
         context["title"] = "%s: %s" % (
             self.object._meta.verbose_name.title(),

shoop/admin/modules/orders/static_src/create/actions/index.js

@@ -27,6 +27,7 @@ export const setAddressSavingOption = createAction("setAddressSavingOption");
 export const setShipToBillingAddress = createAction("setShipToBillingAddress");
 export const setIsCompany = createAction("setIsCompany");
 export const setCustomer = createAction("setCustomer");
+export const showCustomerModal = createAction("showCustomerModal");
 // Methods actions
 export const setShippingMethodChoices = createAction("setShippingMethodChoices");
 export const setShippingMethod = createAction("setShippingMethod");
@@ -85,6 +86,20 @@ export const retrieveCustomerData = function({id}) {
     };
 };
 
+export const retrieveCustomerDetails = function({id}) {
+    return (dispatch) => {
+        return get("customer_details", {
+            id
+        }).then((data) => {
+            if (data.error) {
+                alert(data.error);
+                return;
+            }
+            dispatch(receiveCustomerDetails({ id, data }));
+        });
+    };
+};
+
 export const retrieveOrderSourceData = function () {
     return (dispatch, getState) => {
         const state = getState();
@@ -114,6 +129,7 @@ export const updateLines = () => {
 
 export const receiveProductData = createAction("receiveProductData");
 export const receiveCustomerData = createAction("receiveCustomerData");
+export const receiveCustomerDetails = createAction("receiveCustomerDetails");
 export const receiveOrderSourceData = createAction("receiveOrderSourceData");
 export const endFinalizingOrder = createAction("endFinalizingOrder");
 

shoop/admin/modules/orders/static_src/create/index.js

@@ -23,8 +23,7 @@ import {
     setPaymentMethod,
     setLines,
     setOrderId,
-    updateTotals,
-    clearOrderSourceData
+    updateTotals
 } from "./actions";
 
 var controller = null;
@@ -43,6 +42,7 @@ export function init(config = {}) {
     const customerData = config.customerData;
 
     const persistor = persistStore(store);
+    persistor.purge(["customerDetails"]);
     const resetOrder = window.localStorage.getItem("resetSavedOrder") || "false";
     var savedOrder = {id: null};
     if (resetOrder === "true") {

shoop/admin/modules/orders/static_src/create/reducers/customerDetails.js

@@ -0,0 +1,22 @@
+/**
+ * This file is part of Shoop.
+ *
+ * Copyright (c) 2012-2016, Shoop Ltd. All rights reserved.
+ *
+ * This source code is licensed under the AGPLv3 license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+import {handleActions} from "redux-actions";
+import _ from "lodash";
+
+export default handleActions({
+    retrieveCustomerDetails: _.identity,
+    receiveCustomerDetails: (state, {payload}) => {
+        return _.assign(state, {
+            customerInfo: payload.data.customer_info,
+            orderSummary: payload.data.order_summary,
+            recentOrders: payload.data.recent_orders
+        });
+    },
+    showCustomerModal: ((state, {payload}) => _.assign(state, {showCustomerModal: payload}))
+}, {});

shoop/admin/modules/orders/static_src/create/reducers/index.js

@@ -12,11 +12,22 @@ import productData from "./productData";
 import shop from "./shop";
 import customer from "./customer";
 import customerData from "./customerData";
+import customerDetails from "./customerDetails";
 import methods from "./methods";
 import order from "./order";
 import comment from "./comment";
 
-const childReducer = combineReducers({lines, productData, shop, customer, customerData, methods, order, comment});
+const childReducer = combineReducers({
+    lines,
+    productData,
+    shop,
+    customer,
+    customerData,
+    customerDetails,
+    methods,
+    order,
+    comment
+});
 
 export default function(state, action) {
     if(action.type === "_replaceState") { // For debugging purposes.