merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #686 from jitendra-webkul/jitendra 

Updated customer group mapping function name
This commit is contained in:
Jitendra Singh 2019-03-13 12:25:22 +05:30 committed by GitHub
parent 5b8b782b39 672f2f8c2b
commit fcd99188da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php
View File

@ -78,7 +78,7 @@
<label for="customerGroup" >{{ __('admin::app.customers.customers.customer_group') }}</label>
@if (! is_null($customer->customer_group_id))
<?php $selectedCustomerOption = $customer->customerGroup->id ?>
<?php $selectedCustomerOption = $customer->group->id ?>
@else
<?php $selectedCustomerOption = '' ?>
@endif

2
packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php
View File

@ -119,7 +119,7 @@
</span>
<span class="value">
{{ $order->customer->customerGroup['name'] }}
{{ $order->customer->group['name'] }}
</span>
</div>
@endif

4
packages/Webkul/Customer/src/Models/Customer.php
View File

@ -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');
}
/**