Преглед на файлове

处理供应商资料,增加分配与转移功能

wangcz преди 7 години
родител
ревизия
fc64d03838

+ 1 - 1
src/main/resources/dev/message.properties

@@ -7,5 +7,5 @@ plaformB2cComponentApprovedTemplateId=36812a85-d0f9-4d2a-a7aa-62319f092b6f
 plaformB2cComponentUnproveTemplateId=6228240a-93ba-405f-851c-f874a6c99864
 plaformB2cSupplyChainTemplateId=b28337ba-f115-4f11-b457-15d558443160
 
-messagePublicServiceDevUrl=http://188.131.128.107:24001/message
+messagePublicServiceDevUrl=http://188.131.128.107:24001
 inviteVendorMailTemplateId=9028790a-9fc0-4759-a2df-8c26a7f3aa9a

+ 1 - 1
src/main/resources/dev/sys.properties

@@ -53,7 +53,7 @@ inquiryServiceUrl=http://188.131.128.107:24000
 inquiryServiceInnerUrl=http://188.131.128.107:24000
 
 #public message  service url
-messageServiceUrl=http://188.131.128.107:24001/message/
+messageServiceUrl=http://188.131.128.107:24001/
 
 #b2b
 b2b=http://tb2b.usoftchina.com

+ 18 - 5
src/main/webapp/resources/js/common/b2bServices.js

@@ -197,25 +197,38 @@ define([ 'angular', 'common/services', 'common/utils', 'big'], function(angular,
                     method: 'POST',
                     isArray: true
                 },
+                findSaleUsers: {
+                    url: 'vendorDistribute/:id',
+                    method: 'POST',
+                    isArray: true
+                },
+                addSaleUserToVendor: {
+                    url: 'vendorDistribute/bindVendor/:id',
+                    method: 'POST'
+                },
                 addUserToVendor: {
-                    url: b2bPath + '/account/user/bindUserToVendor/:uu',
+                    url: 'account/user/bindUserToVendor/:uu',
+                    method: 'POST'
+                },
+                transferSaleUserToVendor: {
+                    url: 'vendorDistribute/bindUserToVendor/:id',
                     method: 'POST'
                 },
                 transferUserToVendor: {
-                    url: b2bPath + '/account/user/transferUserToVendor/:uu',
+                    url: 'account/user/transferUserToVendor/:uu',
                     method: 'POST'
                 },
                 transferMyDistribute: {
-                    url: b2bPath + '/account/user/transferMyDistribute',
+                    url: 'account/user/transferMyDistribute',
                     method: 'POST'
                 },
                 findDistribute: {
-                    url: b2bPath + '/account/user/findDistribute',
+                    url: 'account/user/findDistribute',
                     method: 'GET',
                     isArray: true
                 },
                 getDistribute: {
-                    url: b2bPath + '/account/user/getDistribute/:custUU',
+                    url: 'account/user/getDistribute/:custUU',
                     method: 'GET'
                 },
                 getEnTransfer: {

+ 1 - 1
src/main/webapp/resources/js/common/services.js

@@ -160,7 +160,7 @@ define([ 'angular', 'common/utils', 'big'], function(angular, utils, Big) {
                     } else if (this.getRootPath().indexOf('b2c.usoftchina.com') > -1 || this.getRootPath().indexOf('mall.usoftchina.com') > -1) {
                         $rootScope.b2bUrl = 'https://b2b.usoftchina.com'
 					} else {
-                        $rootScope.b2bUrl = 'https://tb2b.usoftchina.com'
+                        $rootScope.b2bUrl = 'http://10.1.51.8090/platform-b2b'
 					}
 				}
 				return $rootScope.b2bUrl;

+ 2 - 2
src/main/webapp/resources/js/sso/app.js

@@ -494,8 +494,8 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'commo
 		$scope.homeUrl = BaseService.getRootPath();
         InternalMessage.getUrl({}, function(data) {
             var url = data.url;
-            if (url == "http://188.131.128.107:24001/message") {
-                url = 'http://10.1.51.92:24001/message';
+            if (url == "http://188.131.128.107:24001/") {
+                url = 'http://188.131.128.107:24001/';
             }
             var param = {
                 'receiverUu': data.userUU,

+ 2 - 2
src/main/webapp/resources/js/usercenter/app.js

@@ -963,8 +963,8 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'commo
 		$scope.homeUrl = BaseService.getRootPath();
         InternalMessage.getUrl({}, function(data) {
             var url = data.url;
-            if (url == "http://188.131.128.107:24001/message") {
-                url = 'http://10.1.51.92:24001/message';
+            if (url == "http://188.131.128.107:24001") {
+                url = 'http://188.131.128.107:24001';
             }
             var param = {
                 'receiverUu': data.userUU,

+ 278 - 1
src/main/webapp/resources/js/usercenter/controllers/b2b/Purc/PurcVendorCtrl.js

@@ -56,7 +56,284 @@ define(['app/app'], function(app) {
         $scope.purcByEn = function (businessCode) {
             $rootScope.businessCode = businessCode;
             window.location.hash = "#/purc/addOrder";
-        }
+        };
+
+        // 分配用户
+        $scope.addUserInfo = function (customer) {
+            var modalInstance = $modal.open({
+                animation: true,
+                templateUrl: 'static/view/vendor/b2b/modal/add_userInfo.html',
+                controller: 'AddUserInfoCtrl',
+                resolve: {
+                    customer: function () {
+                        return customer;
+                    }
+                }
+            });
+            modalInstance.result.then(function (changed, checked) {
+                if (changed) {
+                    if (checked)
+                        $scope.newUser.roles = checked;
+                    else
+                        loadUsers();
+                }
+                $scope.customerParams.reload();
+            });
+        };
+
+        // 转移权限
+        $scope.transferUserInfo = function (customer) {
+            var modalInstance = $modal.open({
+                animation: true,
+                templateUrl: 'static/view/vendor/b2b/modal/transfer_userInfo.html',
+                controller: 'TransferUserInfoCtrl',
+                resolve: {
+                    customer: function () {
+                        return customer;
+                    }
+                }
+            });
+            modalInstance.result.then(function (changed, checked) {
+                if (changed) {
+                    if (checked)
+                        $scope.newUser.roles = checked;
+                    else
+                        loadUsers();
+                }
+                $scope.customerParams.reload();
+            });
+        };
+
+    }]);
+
+    // 转移权限
+    app.register.controller('TransferUserInfoCtrl', ['$scope', '$rootScope', '$modalInstance', 'customer', 'B2bAccountUser', 'toaster', 'B2bAuthenticationService', function ($scope, $rootScope, $modalInstance, customer, AccountUser, toaster, AuthenticationService) {
+        AuthenticationService.getAuthentication().success(function (data) {
+            $scope.loading = false;
+            $scope.thisUser = data;
+            $scope.checkboxes = {
+                checked: false
+            };
+            $scope.loading = true;
+            $scope.transfer = [];
+            AccountUser.findSaleUsers({id : customer.id}, {}, function (data) {
+                $scope.userinfos = data;
+                var transfer = [];
+                angular.forEach($scope.userinfos, function (user, index) {
+                    // 当前用户是被管理员转移权限时,转移的是被管理员转移的权限。
+                    if ($scope.thisUser.userUU === user.userUU && user.transfer) {
+                        $scope.thisUser.transfer = true;
+                    }
+                });
+                angular.forEach($scope.userinfos, function (user, index) {
+                    if ($scope.thisUser.sys || $scope.thisUser.transfer) {
+                        if (user.transfer) {
+                            transfer.push({num: index});
+                            user.checked = true;
+                        }
+                    } else {
+                        if (user.distribute) {
+                            transfer.push({num: index});
+                            user.checked = true;
+                        }
+                    }
+                });
+                $scope.transfer = transfer;
+                $scope.havedone = angular.copy($scope.transfer);
+                $scope.loading = false;
+            });
+        });
+
+        var checkStatus = function (userinfos) {
+            var transfer = [];
+            angular.forEach(userinfos, function (user, index) {
+                if (user.transfer) {
+                    transfer.push({num: index});
+                }
+            });
+            $scope.transfer = transfer;
+            $scope.isChanged = !angular.equals($scope.havedone, $scope.transfer);
+        };
+        $scope.isChanged = false;
+        $scope.isChangedAll = false;
+        $scope.changes = [];
+        // 点击其中一个明细的复选框
+        $scope.checkOne = function (user) {
+            $scope.changes = [];
+            if ($scope.thisUser.sys) { // 管理员操作
+                user.$checked = !user.$checked;
+                angular.forEach($scope.userinfos, function (userInfo) {
+                    if ($scope.thisUser.userUU === user.userUU && user.transfer) {
+                        $scope.thisUser.transfer = true;
+                    }
+                    if (user.userUU !== userInfo.userUU) {
+                        userInfo.transfer = false;
+                    }
+                });
+            } else if ($scope.thisUser.transfer) { // 被管理员转移权限的非管理员操作
+                user.$checked = !user.$checked;
+                angular.forEach($scope.userinfos, function (userInfo) {
+                    if (user.userUU !== userInfo.userUU) {
+                        userInfo.transfer = false;
+                    } else {
+                        userInfo.transfer = true;
+                    }
+                });
+            } else { // 被分配客户的用户
+                user.$checked = !user.$checked;
+                angular.forEach($scope.userinfos, function (userInfo) {
+                    if (user.userUU !== userInfo.userUU) {
+                        // userInfo.distribute = false;
+                        userInfo.checked = false;
+                        userInfo.transfer = false;
+                    } else {
+                        // userInfo.distribute = true;
+                        userInfo.checked = true;
+                        userInfo.transfer = true;
+                    }
+                });
+            }
+            checkStatus($scope.userinfos);
+        };
+        $scope.close = function (save) {
+            var chooseResult = [];
+            if (save) {
+                if (customer.vendorEnterprise.uu) {
+                    // 当前用户是管理员时
+                    if ($scope.thisUser.sys) {
+                        angular.forEach($scope.userinfos, function (item, i) {
+                            chooseResult.push(item);
+                        });
+                        if (chooseResult.length > 0) {
+                            $scope.loading = true;
+                            AccountUser.transferSaleUserToVendor({id : customer.id}, chooseResult, function (data) {
+                                $scope.loading = false;
+                                toaster.pop('success', '提示', '保存成功');
+                                $modalInstance.close(false);
+                            }, function (response) {
+                                $scope.loading = false;
+                                toaster.pop('error', '保存失败', response.data);
+                                $modalInstance.close(false);
+                            })
+                        } else {
+                            toaster.pop('error', '保存失败', "您未勾选任何记录");
+                        }
+                    } else {
+                        toaster.pop('info', '提示', "您没有权限转移对象");
+                        // 非管理员转移自己的权限时
+                        // angular.forEach($scope.userinfos, function (item, i) {
+                        //     if (item.transfer && item.userUU !== $scope.thisUser.userUU) {
+                        //         $scope.target = item;
+                        //     }
+                        // });
+                        // if (!$scope.target) {
+                        //     toaster.pop('error', '保存失败', "您未选择权限转移对象");
+                        // } else {
+                        //     $scope.loading = true;
+                        //     AccountUser.transferMyDistribute({custUU: customer.myEnterprise.uu, userUU: $scope.target.userUU}, {} ,function (data) {
+                        //         $scope.loading = false;
+                        //         toaster.pop('success', '提示', '保存成功');
+                        //         $modalInstance.close(false);
+                        //     }, function (response) {
+                        //         $scope.loading = false;
+                        //         toaster.pop('error', '保存失败', response.data);
+                        //         $modalInstance.close(false);
+                        //     });
+                        // }
+                    }
+                } else {
+                    $modalInstance.close(true, $scope.checkboxes.checked);
+                }
+            } else {
+                $modalInstance.close(false);
+            }
+        };
 
     }]);
+    app.register.controller('AddUserInfoCtrl', ['$scope', '$modalInstance', 'customer', 'B2bAccountUser', 'toaster', 'AuthenticationService',
+        function ($scope, $modalInstance, customer, AccountUser, toaster, AuthenticationService) {
+            AuthenticationService.getAuthentication().success(function (data) {
+                $scope.thisUser = data;
+                $scope.checkboxes = {
+                    checked: false
+                };
+                $scope.loading = true;
+                $scope.distribute = [];
+                AccountUser.findSaleUsers({id : customer.id}, null, function (data) {
+                    $scope.userinfos = data;
+                    var distribute = [];
+                    angular.forEach($scope.userinfos, function (user, index) {
+                        if (user.distribute) {
+                            distribute.push({num: index});
+                        }
+                    });
+                    $scope.distribute = distribute;
+                    $scope.havedone = angular.copy($scope.distribute);
+                    $scope.loading = false;
+                });
+            });
+
+            var checkStatus = function (userinfos) {
+                var distribute = [];
+                angular.forEach(userinfos, function (user, index) {
+                    if (user.distribute) {
+                        distribute.push({num: index});
+                    }
+                });
+                $scope.distribute = distribute;
+                $scope.isChanged = !angular.equals($scope.havedone, $scope.distribute);
+            }
+            $scope.isChanged = false;
+            $scope.isChangedAll = false;
+            $scope.changes = [];
+            // 点击勾选全部的复选框
+            $scope.checkAll = function () {
+                angular.forEach($scope.userinfos, function (item, index) {
+                    item.distribute = $scope.checkboxes.checked;
+                });
+                checkStatus($scope.userinfos);
+            };
+
+            // 点击其中一个明细的复选框
+            $scope.checkOne = function () {
+                var result = true;
+                angular.forEach($scope.userinfos, function (item) {
+                    if (item.distribute != true) {
+                        result = false;
+                        return;
+                    }
+                });
+                $scope.checkboxes.checked = result;
+                checkStatus($scope.userinfos);
+            };
+            $scope.close = function (save) {
+                var chooseResult = [];
+                if (save) {
+                    if (customer.id) {
+                        angular.forEach($scope.userinfos, function (item, i) {
+                            chooseResult.push(item);
+                        });
+                        if (chooseResult.length > 0) {
+                            $scope.loading = true;
+                            AccountUser.addSaleUserToVendor({id : customer.id}, chooseResult, function (data) {
+                                $scope.loading = false;
+                                toaster.pop('success', '提示', '保存成功');
+                                $modalInstance.close(false);
+                            }, function (response) {
+                                $scope.loading = false;
+                                toaster.pop('error', '保存失败', response.data);
+                                $modalInstance.close(false);
+                            })
+                        } else {
+                            toaster.pop('error', '保存失败', "您未勾选任何记录");
+                        }
+                    } else {
+                        $modalInstance.close(true, $scope.checkboxes.checked);
+                    }
+                } else {
+                    $modalInstance.close(false);
+                }
+            };
+
+        }]);
 });

+ 4 - 4
src/main/webapp/resources/js/usercenter/controllers/forstore/messagePersonalCtrl.js

@@ -322,8 +322,8 @@ define(['app/app'], function(app) {
         var getData = function () {
             InternalMessage.getUrl({}, function(data) {
                 var url = data.url;
-                if (url == "http://188.131.128.107:24001/message") {
-                    url = 'http://10.1.51.92:24001/message';
+                if (url == "http://188.131.128.107:24001/") {
+                    url = 'http://188.131.128.107:24001/';
                 }
                 var param = {
                     'receiverUu': data.userUU,
@@ -346,8 +346,8 @@ define(['app/app'], function(app) {
             InternalMessage.getUrl({}, function(info) {
                 if (info) {
                     var url = info.url;
-                    if (url == "http://188.131.128.107:24001/message") {
-                        url = 'http://10.1.51.92:24001/message';
+                    if (url == "http://188.131.128.107:24001/") {
+                        url = 'http://188.131.128.107:24001/';
                     }
                     var param = {
                         'receiverUu': info.userUU,

+ 2 - 2
src/main/webapp/resources/js/vendor/app.js

@@ -1236,8 +1236,8 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
         /*console.info($rootScope.userInfo);*/
         InternalMessage.getUrl({}, function(data) {
             var url = data.url;
-            if (url == "http://188.131.128.107:24001/message") {
-                url = 'http://10.1.51.92:24001/message';
+            if (url == "http://188.131.128.107:24001/") {
+                url = 'http://188.131.128.107:24001/';
             }
             var param = {
                 'receiverUu': data.userUU,

+ 6 - 0
src/main/webapp/resources/js/vendor/controllers/b2b/sale/saleCustomerCtrl.js

@@ -66,6 +66,9 @@ define(['app/app'], function (app) {
                         resolve: {
                             customer: function () {
                                 return customer;
+                            },
+                            type: function () {
+                                return 'purchase'
                             }
                         }
                     });
@@ -100,6 +103,9 @@ define(['app/app'], function (app) {
                         resolve: {
                             customer: function () {
                                 return customer;
+                            },
+                            type: function () {
+                                return 'purchase'
                             }
                         }
                     });

+ 4 - 4
src/main/webapp/resources/js/vendor/controllers/forstore/messagePersonalCtrl.js

@@ -287,8 +287,8 @@ define(['app/app'], function(app) {
             //获取所有消息数量
             InternalMessage.getUrl({}, function(data) {
                 var url = data.url;
-                if (url == "http://188.131.128.107:24001/message") {
-                    url = 'http://10.1.51.92:24001/message';
+                if (url == "http://188.131.128.107:24001/") {
+                    url = 'http://188.131.128.107:24001/';
                 }
                 var param = {
                     'receiverUu': data.userUU,
@@ -311,8 +311,8 @@ define(['app/app'], function(app) {
             InternalMessage.getUrl({}, function(info) {
                 if (info) {
                     var url = info.url;
-                    if (url == "http://188.131.128.107:24001/message") {
-                        url = 'http://10.1.51.92:24001/message';
+                    if (url == "http://188.131.128.107:24001/") {
+                        url = 'http://188.131.128.107:24001/';
                     }
                     var param = {
                         'receiverUu': info.userUU,

+ 13 - 13
src/main/webapp/resources/view/common/footer.html

@@ -147,17 +147,17 @@ a:hover {
 	</div>
 </div>
 <!-- Piwik -->
-<script type="text/javascript">
-    var _paq = _paq || [];
-    /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
-    _paq.push(['trackPageView']);
-    _paq.push(['enableLinkTracking']);
-    (function() {
-        var u="//piwik.ubtob.com/";
-        _paq.push(['setTrackerUrl', u+'piwik.php']);
-        _paq.push(['setSiteId', '1']);
-        var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-        g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
-    })();
-</script>
+<!--<script type="text/javascript">-->
+    <!--var _paq = _paq || [];-->
+    <!--/* tracker methods like "setCustomDimension" should be called before "trackPageView" */-->
+    <!--_paq.push(['trackPageView']);-->
+    <!--_paq.push(['enableLinkTracking']);-->
+    <!--(function() {-->
+        <!--var u="//piwik.ubtob.com/";-->
+        <!--_paq.push(['setTrackerUrl', u+'piwik.php']);-->
+        <!--_paq.push(['setSiteId', '1']);-->
+        <!--var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];-->
+        <!--g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);-->
+    <!--})();-->
+<!--</script>-->
 <!-- End Piwik Code -->

+ 13 - 9
src/main/webapp/resources/view/usercenter/b2b/Purc/vendor.html

@@ -109,18 +109,17 @@
 					   ng-table="customerParams">
 					<thead>
 					<tr class="pane-header">
-						<th width="80" class="text-center">UU</th>
-						<th width="180" class="text-center">供应商名称</th>
-						<th width="120" class="text-center">简称</th>
+						<th width="250" class="text-center">供应商名称</th>
 						<th width="200" class="text-center">地址</th>
 						<th width="100" class="text-center">联系人</th>
-						<th width="80" class="text-center">联系电话</th>
-						<th width="170" class="text-center">操作</th>
+						<th width="80" class="text-center">供应商电话</th>
+						<th width="200" class="text-center">采购对接人</th>
+						<th width="100" class="text-center">操作</th>
 					</tr>
 					</thead>
 					<tbody ng-if="$data.length === 0">
 					<tr>
-						<td colspan="7">
+						<td colspan="6">
 							<div id="empty">
 								<div class="left_img">
 									<a><img src="static/img/all/empty-cart.png"></a>
@@ -135,15 +134,20 @@
 					</tbody>
 					<tbody>
 					<tr ng-repeat="vendor in $data">
-						<td ng-bind="::vendor.vendorEnterprise.uu"></td>
 						<td class="text-center"><a href="#/purc/vendor/{{vendor.id}}" ng-bind="::vendor.vendorEnterprise.enName" title="查看供应商资料" class="color32 order-detail"></a></td>
-						<td class="text-center" ng-bind="::vendor.vendorEnterprise.enShortname"></td>
 						<td class="text-center" ng-bind="::vendor.vendorEnterprise.enAddress"></td>
 						<td class="text-center" ng-bind="::vendor.vendorUser.userName"></td>
 						<td class="text-center" ng-bind="::vendor.vendorUser.userTel"></td>
+						<td class="text-center" title="{{vendor.saleContacts.toString()}}">
+							<span ng-repeat="users in vendor.saleContacts | limitTo: 3">{{users}}<br/></span>
+							<span ng-if="vendor.saleContacts.length > 3">...</span>
+							<span ng-if="!vendor.saleContacts || vendor.saleContacts.length === 0">-</span>
+						</td>
 						<td class="text-center">
 							<a ng-click="purcByEn(vendor.vendorEnterprise.enBussinessCode)">下采购单</a><br/>
-							<a href="#/purc/purcinquiry/{{vendor.vendorEnterprise.enBussinessCode}}">立即询价</a>
+							<a href="#/purc/purcinquiry/{{vendor.vendorEnterprise.enBussinessCode}}">立即询价</a><br/>
+							<a title="被分配的用户享有查看和操作权限" ng-click="addUserInfo(vendor)">分配</a><br/>
+							<a title="被转移权限的用户可以分配权限给其他用户" ng-click="transferUserInfo(vendor)">转移</a>
 						</td>
 					</tr>
 					</tbody>

+ 11 - 9
src/main/webapp/resources/view/vendor/b2b/sale/customer.html

@@ -140,23 +140,25 @@
 					   ng-table="customerParams">
 					<thead>
 					<tr class="header">
-						<th width="80">UU</th>
-						<th width="180">客户名称</th>
+						<th width="190">客户名称</th>
 						<th width="180">地址</th>
 						<th width="80">客户联系人</th>
-						<th width="100">联系人电话</th>
-						<th width="80">我方联系人</th>
-						<th width="110">用户分配</th>
+						<th width="100">客户电话</th>
+						<th width="160">业务对接人</th>
+						<th width="100">用户分配</th>
 					</tr>
 					</thead>
 					<tbody ng-repeat="customer in $data" ng-mouseenter="showUserInfo(customer,true)" ng-mouseleave="showUserInfo(customer,false)">
 					<tr>
-						<td class="text-center" ng-bind="::customer.myEnterprise.uu"></td>
-						<td class="text-center"><a ng-click="viewDetail(customer.id)" title="查看客户资料" ng-bind="::customer.myEnterprise.enName" class="base-blue order-detail"></a></td>
+						<td class="text-center"><a ng-click="viewDetail(customer.id)" title="查看客户资料" ng-bind="::customer.myEnterprise.enName" class="color32 order-detail"></a></td>
 						<td class="text-center" ng-bind="::customer.myEnterprise.enAddress"></td>
 						<td class="text-center" ng-bind="::customer.myUser.userName"></td>
 						<td ng-bind="::customer.myUser.userTel"></td>
-						<td class="text-center" ng-bind="::customer.vendorUser.userName"></td>
+						<td class="text-center" title="{{customer.purchaseContacts.toString()}}">
+							<span ng-repeat="users in customer.purchaseContacts | limitTo: 3">{{users}}<br/></span>
+							<span ng-if="customer.purchaseContacts.length > 3">...</span>
+							<span ng-if="!customer.purchaseContacts || customer.purchaseContacts.length === 0">-</span>
+						</td>
 						<td class="text-center">
 							<!--<a title="展开" class="text-muted" ng-click="open(customer,$index)"><i class="fa fa-toggle-down fa-lg"></i></a>-->
 							<!--<a ng-click="viewDetail(customer.id)">查看详情</a><br/>-->
@@ -167,7 +169,7 @@
 					</tbody>
 					<tbody ng-if="$data.length === 0">
 					<tr>
-						<td colspan="7">
+						<td colspan="6">
 							<div id="empty">
 								<div class="left_img">
 									<a><img src="static/img/all/empty-cart.png"></a>