From 672f2f8c2b5c3861b575fb477083e5efe0b9e9df Mon Sep 17 00:00:00 2001 From: jitendra Date: Wed, 13 Mar 2019 12:24:32 +0530 Subject: [PATCH] Updated customer group mapping function name --- .../Webkul/Admin/src/Resources/views/customers/edit.blade.php | 2 +- .../Admin/src/Resources/views/sales/orders/view.blade.php | 2 +- packages/Webkul/Customer/src/Models/Customer.php | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php index e363c841d..4c3ca7fb5 100755 --- a/packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php @@ -78,7 +78,7 @@ @if (! is_null($customer->customer_group_id)) - customerGroup->id ?> + group->id ?> @else @endif diff --git a/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php index d281a33cf..bd9cd82d2 100755 --- a/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php @@ -119,7 +119,7 @@ - {{ $order->customer->customerGroup['name'] }} + {{ $order->customer->group['name'] }} @endif diff --git a/packages/Webkul/Customer/src/Models/Customer.php b/packages/Webkul/Customer/src/Models/Customer.php index 2628b1c4d..5da3fb891 100755 --- a/packages/Webkul/Customer/src/Models/Customer.php +++ b/packages/Webkul/Customer/src/Models/Customer.php @@ -30,9 +30,9 @@ class Customer extends Authenticatable implements CustomerContract /** * Get the customer group that owns the customer. */ - public function customerGroup() + public function group() { - return $this->belongsTo(CustomerGroupProxy::modelClass()); + return $this->belongsTo(CustomerGroupProxy::modelClass(), 'customer_group_id'); } /**