Merge pull request #80 from openclassify/vedattt

#404
This commit is contained in:
Fatih Alp 2019-09-05 12:25:39 +03:00 committed by GitHub
commit 35cba186a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 36 additions and 4 deletions

View File

@ -58,6 +58,15 @@ return [
],
],
'iban_numbers' => [
'type' => 'anomaly.field_type.wysiwyg',
'bind' => 'adv.iban',
'env' => 'ADV_IBAN',
'config' => [
'default_value' => '<h3>TR00 0000 0000 0000 0000 0000 00</h3>',
],
],
'default_country' => [
'type' => 'anomaly.field_type.relationship',
'bind' => 'adv.default_country',

View File

@ -3,4 +3,6 @@
return [
'error_added_cart' => 'Requested product is currently missing or inactive',
'please_buy_package' => 'Please buy package',
'please_payment' => 'Please Pay',
'bank_account_info' => 'Bank account information',
];

View File

@ -25,6 +25,9 @@ return [
'map_coordinates_lat' => [
'name' => 'Map Lat Coordinate',
],
'iban_numbers' => [
'name' => 'IBAN',
],
'logo' => [
'name' => 'Logo',
],

View File

@ -1,6 +1,8 @@
<?php
return[
"error_added_cart" =>"İstenen ürün şu anda eksik veya etkin değil",
"please_buy_package" =>"Lütfen paket satın al"
return [
"error_added_cart" => "İstenen ürün şu anda eksik veya etkin değil",
"please_buy_package" => "Lütfen paket satın al",
'please_payment' => 'Lütfen Ödeme Yspınız',
'bank_account_info' => 'Banka Hesap Bilgilerimiz',
];

View File

@ -102,7 +102,9 @@
{% if detail.item_type == 'adv' %}
<div class="col-md-12 text-center">
<div class="col-md-3 col-sm-3">
<h5 {% if detail.status == 'awaiting_payment' or detail.status == 'awaiting_tracking_number' %}
<h5 {% if detail.status == 'awaiting_payment'
or detail.status == 'awaiting_tracking_number'
and details[0].getStatus() == "approved" %}
class="warning-color"
{% endif %}><i
class="fa fa-clock-o"></i> {{ trans("visiosoft.module.profile::field.awaiting_dispatch.name") }}
@ -194,6 +196,20 @@
</div>
</div>
</div>
{% if details[0].getOrderType() == "order" and details[0].getStatus() == "pending" %}
<div class="card order-item">
<div class="row order-item-footer">
<div class="col-md-12 text-center">
<h3 class="danger-color">{{ trans('visiosoft.module.advs::message.please_payment') }}</h3>
<h4> {{ trans('visiosoft.module.advs::message.bank_account_info') }}:</h4>
{{ setting_value('visiosoft.module.advs::iban_numbers')|raw }}
</div>
</div>
</div>
{% endif %}
</div><!-- section -->