Skip to content

Commit

Permalink
Merge pull request #19 from eccubevn/vn-fix-postal-address
Browse files Browse the repository at this point in the history
Vn fix postal address
  • Loading branch information
toannguyen-lockon authored Jan 18, 2019
2 parents 797fa0c + c9dee97 commit 7aa694b
Show file tree
Hide file tree
Showing 21 changed files with 141 additions and 24 deletions.
4 changes: 2 additions & 2 deletions app/template/admin/Customer/edit.twig
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ file that was distributed with this source code.
</td>
<td class="align-middle">
<a href="{{ url('admin_customer_delivery_edit', { 'id': Customer.id, 'did': CustomerAddress.id }) }}">
{{ 'admin.common.postal_symbol'|trans }}{{ CustomerAddress.postal_code }} {{ CustomerAddress.Pref }}{{ CustomerAddress.addr01 }}{{ CustomerAddress.addr02 }}
{{ format_address(CustomerAddress.addr01, CustomerAddress.addr02, CustomerAddress.Pref, CustomerAddress.postal_code) }}
</a>
</td>
<td class="align-middle">
Expand All @@ -296,7 +296,7 @@ file that was distributed with this source code.
</div>
<div class="modal-body text-left">
<p class="text-left">
{{ 'admin.common.delete_modal__message'|trans({ '%name%' : 'admin.common.postal_symbol'|trans ~ CustomerAddress.postal_code ~ CustomerAddress.Pref ~ ' ' ~ CustomerAddress.name01 ~ CustomerAddress.name02 }) }}</p>
{{ 'admin.common.delete_modal__message'|trans({ '%name%' : format_address(CustomerAddress.addr01, CustomerAddress.addr02, CustomerAddress.Pref, CustomerAddress.postal_code) }) }}</p>
</div>
<div class="modal-footer">
<button class="btn btn-ec-sub" type="button" data-dismiss="modal">
Expand Down
4 changes: 2 additions & 2 deletions app/template/admin/Order/edit.twig
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ file that was distributed with this source code.
<div class="col-2">
<div class="d-inline-block"><span class="card-title">{{ 'admin.order.orderer'|trans }}</span></div>
</div>
<div class="col">{% if id %}<span class="mr-5">{% if form.Customer.vars.value is empty %}{{ 'admin.order.non_member'|trans }}{% else %}<a href="{{ url('admin_customer_edit', {'id': form.Customer.vars.value}) }}">{{ form.Customer.vars.value }}</a>{% endif %}</span>{{ Order.full_name }} ({{ Order.full_name_kana }}) {{ Order.postal_code }} {{ Order.pref }}{{ Order.addr01 }}{{ Order.addr02 }} {{ Order.email }}{% endif %}</div>
<div class="col">{% if id %}<span class="mr-5">{% if form.Customer.vars.value is empty %}{{ 'admin.order.non_member'|trans }}{% else %}<a href="{{ url('admin_customer_edit', {'id': form.Customer.vars.value}) }}">{{ form.Customer.vars.value }}</a>{% endif %}</span>{{ Order.full_name }} ({{ Order.full_name_kana }}) {{ format_address(Order.addr01, Order.addr02, Order.pref, Order.postal_code) }} {{ Order.email }}{% endif %}</div>
<div class="col-1 text-right"><a class="d-block" data-toggle="collapse" href="#ordererInfo" aria-expanded="false" aria-controls="ordererInfo"><i class="fa {{ id ? 'fa-angle-down' : 'fa-angle-up' }} fa-lg"></i></a></div>
</div>
</div>
Expand Down Expand Up @@ -498,7 +498,7 @@ file that was distributed with this source code.
<div class="col">
<span class="mr-5">{{ 'admin.order.delivery'|trans }}({{ loop.index }})</span>
{% set shipping_name = shipping.full_name ~ '(' ~ shipping.full_name_kana ~ ')' ~ shipping.company_name is not null ? shipping.company_name : '' %}
{% set shipping_addr = 'admin.common.postal_symbol'|trans ~ shipping.postal_code ~ ' ' ~ shipping.pref ~ shipping.addr01 ~ shipping.addr02 %}
{% set shipping_addr = format_address(shipping.addr01, shipping.addr02, shipping.pref, shipping.postal_code) %}
{% set shipping_date = shipping.shipping_date is not null ? shipping.shipping_date|date_day : '' %}
{{ shipping_name }} {{ shipping_addr }} {{ shipping.phone_number }} {{ shipping_date }}
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/template/admin/Order/mail.twig
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ $(function() {
</div>
<div class="row mb-2">
<div class="col-2"><span>{{ 'admin.order.orderer'|trans }}</span></div>
<div class="col-4"><span>{{ Order.name01 }} {{ Order.name02 }}({{ Order.kana01 }} {{ Order.kana02 }})</span><br>{{ 'admin.common.postal_symbol'|trans }}{{ Order.postal_code }}<br>{{ Order.pref }}{{ Order.addr01 }}{{ Order.addr02 }}</div>
<div class="col-4"><span>{{ Order.name01 }} {{ Order.name02 }}({{ Order.kana01 }} {{ Order.kana02 }})</span><br>{{ format_address(Order.addr01, Order.addr02, Order.pref, Order.postal_code) }}</div>
<div class="col-2"><span>{{ 'admin.order.purchase_product'|trans }}</span></div>
<div class="col-4"><span>
{% if Order.productOrderItems %}
Expand Down
2 changes: 1 addition & 1 deletion app/template/admin/Order/mail_confirm.twig
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ $(function() {
</div>
<div class="row mb-2">
<div class="col-2"><span>{{ 'admin.order.orderer'|trans }}</span></div>
<div class="col-4"><span>{{ Order.name01 }} {{ Order.name02 }}({{ Order.kana01 }} {{ Order.kana02 }})</span><br>{{ Order.postal_code }}<br>{{ Order.pref }}{{ Order.addr01 }}{{ Order.addr02 }}</div>
<div class="col-4"><span>{{ Order.name01 }} {{ Order.name02 }}({{ Order.kana01 }} {{ Order.kana02 }})</span><br>{{ format_address(Order.addr01, Order.addr02, Order.pref, Order.postal_code) }}</div>
<div class="col-2"><span>{{ 'admin.order.purchase_product'|trans }}</span></div>
<div class="col-4"><span>
{% if Order.productOrderItems %}
Expand Down
2 changes: 1 addition & 1 deletion app/template/default/Contact/index.twig
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ file that was distributed with this source code.
<div class="ec-icon"><img
src="{{ asset('assets/icon/question-white.svg') }}" alt="">
</div>
</div><a href="https://www.post.japanpost.jp/zipcode/" target="_blank"><span>{{ 'common.search_postal_code'|trans }}</span></a>
</div><a href="{{ url('help_postalcode') }}" target="_blank"><span>{{ 'common.search_postal_code'|trans }}</span></a>
</div>
{{ form_errors(form.postal_code) }}
<div class="ec-select{{ has_errors(form.address.pref) ? ' error' }}">
Expand Down
4 changes: 2 additions & 2 deletions app/template/default/Help/about.twig
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ file that was distributed with this source code.
<dt>
<label class="ec-label">{{ 'common.address'|trans }}</label>
</dt>
<dd>{{ 'common.postal_symbol'|trans }}{{ BaseInfo.postal_code }}<br />
{{ BaseInfo.pref }}{{ BaseInfo.addr01 }}{{ BaseInfo.addr02 }}
<dd>
{{ format_address(BaseInfo.addr01, BaseInfo.addr02, BaseInfo.pref, BaseInfo.postal_code) }}
</dd>
</dl>
{% endif %}
Expand Down
90 changes: 90 additions & 0 deletions app/template/default/Help/postalcode.twig
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
{#
This file is part of EC-CUBE
Copyright(c) LOCKON CO.,LTD. All Rights Reserved.
http://www.lockon.co.jp/
For the full copyright and license information, please view the LICENSE
file that was distributed with this source code.
#}
{% extends 'default_frame.twig' %}

{% block javascript %}
<script src="{{ asset('assets/js/postalcode.js') }}" charset="UTF-8"></script>
<script>
let table = jQuery('#postalcode-table').find('tbody');
Object.keys(postalcodeData).forEach(function (k) {
let tr = jQuery('<tr></tr>').addClass('active');
let td = jQuery('<td></td>').attr('colspan', 2).text(k);
table.append(tr.append(td));
Object.keys(postalcodeData[k]).forEach(function(i) {
let tr = jQuery('<tr></tr>');
let td1 = jQuery('<td></td>').text(i);
let td2 = jQuery('<td></td>').text(postalcodeData[k][i]);
table.append(tr.append(td1).append(td2));
});
});
const filter = function(data, str) {
let newData = {};
Object.keys(data).forEach(function (k) {
newData[k] = {};
Object.keys(data[k]).forEach(function(i) {
if (data[k][i].toLowerCase().indexOf(str.toLowerCase()) !== -1) {
newData[k][i] = data[k][i];
}
});
if (Object.keys(newData[k]).length === 0) {
delete newData[k];
}
});
return newData;
};
const render = function(data) {
let table = jQuery('#postalcode-table').find('tbody');
table.empty();
Object.keys(data).forEach(function (k) {
let tr = jQuery('<tr></tr>').addClass('active');
let td = jQuery('<td></td>').attr('colspan', 2).text(k);
table.append(tr.append(td));
Object.keys(data[k]).forEach(function(i) {
let tr = jQuery('<tr></tr>');
let td1 = jQuery('<td></td>').text(i);
let td2 = jQuery('<td></td>').text(data[k][i]);
table.append(tr.append(td1).append(td2));
});
});
};
render(postalcodeData);
jQuery('#search').on('click', function(e) {
render(filter(postalcodeData, jQuery('#keyword').val()));
});
jQuery("#keyword").keypress(function (e) {
if ((e.which && e.which == 13) || (e.keyCode && e.keyCode == 13)) {
render(filter(postalcodeData, jQuery(this).val()));
return false;
} else {
return true;
}
});
</script>
{% endblock javascript %}

{% block main %}
<div class="ec-role">
<div class="ec-pageHeader">
<h1>{{ 'admin.common.postal_symbol'|trans }}</h1>
</div>
<div class="ec-halfInput">
<input type="text" class="ec-input" id="keyword" /><button type="button" class="ec-inlineBtn" id="search">{{ 'common.search_postal_code'|trans }}</button>
</div>
<table class="table table-bordered" id="postalcode-table">
<tbody>
</tbody>
</table>
</div>
{% endblock %}
2 changes: 1 addition & 1 deletion app/template/default/Mypage/change.twig
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ file that was distributed with this source code.
<div class="ec-icon"><img
src="{{ asset('assets/icon/question-white.svg') }}" alt="">
</div>
</div><a href="https://www.post.japanpost.jp/zipcode/" target="_blank"><span>{{ 'common.search_postal_code'|trans }}</span></a>
</div><a href="{{ url('help_postalcode') }}" target="_blank"><span>{{ 'common.search_postal_code'|trans }}</span></a>
</div>
{{ form_errors(form.postal_code) }}
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/template/default/Mypage/delivery.twig
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ file that was distributed with this source code.
</a>
<div class="ec-addressList__address">
<div>{{ CustomerAddress.name01 }}&nbsp;{{ CustomerAddress.name02 }}</div>
<div>{{ 'common.postal_symbol'|trans }}{{ CustomerAddress.postal_code }} {{ CustomerAddress.Pref }}{{ CustomerAddress.addr01 }}{{ CustomerAddress.addr02 }}</div>
<div>{{ format_address(CustomerAddress.addr01, CustomerAddress.addr02, CustomerAddress.pref, CustomerAddress.postal_code) }}</div>
<div>{{ CustomerAddress.phone_number }}</div>
</div>
<div class="ec-addressList__action">
Expand Down
2 changes: 1 addition & 1 deletion app/template/default/Mypage/delivery_edit.twig
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ file that was distributed with this source code.
<div class="ec-icon"><img
src="{{ asset('assets/icon/question-white.svg') }}" alt="">
</div>
</div><a href="https://www.post.japanpost.jp/zipcode/" target="_blank"><span>{{ 'common.search_postal_code'|trans }}</span></a>
</div><a href="{{ url('help_postalcode') }}" target="_blank"><span>{{ 'common.search_postal_code'|trans }}</span></a>
</div>
{{ form_errors(form.postal_code) }}
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/template/default/Mypage/history.twig
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ file that was distributed with this source code.
{% endfor %}
<div class="ec-orderDelivery__address">
<p>{{ Shipping.name01 }}&nbsp;{{ Shipping.name02 }}</p>
<p>{{ 'common.postal_symbol'|trans }}{{ Shipping.postal_code }} {{ Shipping.Pref }}{{ Shipping.addr01 }}{{ Shipping.addr02 }}</p>
<p>{{ format_address(Shipping.addr01, Shipping.addr02, Shipping.pref, Shipping.postal_code) }}</p>
<p>{{ Shipping.phone_number }}</p>
</div>
<div class="ec-definitions--soft">
Expand Down
6 changes: 3 additions & 3 deletions app/template/default/Shopping/confirm.twig
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ file that was distributed with this source code.
<div class="ec-orderAccount__account">
<p class="ec-halfInput">{{ 'common.name.prefix'|trans }} {{ Order.name01 }} {{ Order.name02 }} {{ 'common.name.suffix'|trans }}</p>
<p class="ec-input">{{ Order.companyName }}</span></p>
<p class="ec-zipInput">{{ 'common.postal_symbol'|trans }}{{ Order.postal_code }}</p>
<p class="ec-input">{{ Order.pref }} {{ Order.addr01 }} {{ Order.addr02 }}</p>
<p class="ec-zipInput">{{ Order.postal_code }}</p>
<p class="ec-input">{{ format_address(Order.addr01, Order.addr02, Order.pref) }}</p>
<p class="ec-telInput">{{ Order.phone_number }}</span></p>
<p class="ec-input">{{ Order.email }}</span></p>
</div>
Expand Down Expand Up @@ -106,7 +106,7 @@ file that was distributed with this source code.
</div>
<div class="ec-orderDelivery__address">
<p>{{ 'common.name.prefix'|trans }} {{ shipping.name01 }} {{ shipping.name02 }} {{ 'common.name.suffix'|trans }}</p>
<p>{{ 'common.postal_symbol'|trans }} {{ shipping.postal_code }} {{ shipping.pref }} {{ shipping.addr01 }} {{ shipping.addr02 }}</p>
<p>{{ format_address(shipping.addr01, shipping.addr02, shipping.pref, shipping.postal_code) }}</p>
<p>{{ shipping.phone_number }}</p>
</div>
<div class="ec-orderDelivery__actions">
Expand Down
6 changes: 3 additions & 3 deletions app/template/default/Shopping/index.twig
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ file that was distributed with this source code.
<p class="ec-halfInput" style="display: none"><span class="customer-edit customer-kana01">{{ Order.kana01 }}</span> <span class="customer-edit customer-kana02">{{ Order.kana02 }}</span></p>
<p class="ec-input"><span class="customer-edit customer-company_name">{{ Order.companyName }}</span></p>
<p class="ec-zipInput">〒<span class="customer-edit customer-postal_code">{{ Order.postal_code }}</span></p>
<p class="ec-input"><span class="customer-edit customer-pref">{{ Order.pref }}</span> <span class="customer-edit customer-addr01">{{ Order.addr01 }}</span> <span class="customer-edit customer-addr02">{{ Order.addr02 }}</span></p>
<p class="ec-input"><span class="customer-edit customer-addr02">{{ Order.addr02 }}</span><span class="customer-edit customer-addr01">, {{ Order.addr01 }}</span><span class="customer-edit customer-pref">, {{ Order.pref }}</span></p>
<p class="ec-telInput"><span class="customer-edit customer-phone_number">{{ Order.phone_number }}</span></p>
<p class="ec-input"><span class="customer-edit customer-email">{{ Order.email }}</span></p>
</div>
Expand Down Expand Up @@ -221,7 +221,7 @@ file that was distributed with this source code.
<img src="{{ asset('assets/icon/question-white.svg') }}" alt="">
</div>
</div>
<a href="https://www.post.japanpost.jp/zipcode/" target="_blank">
<a href="{{ url('help_postalcode') }}" target="_blank">
<span>{{ 'common.search_postal_code'|trans }}</span>
</a>
</div>
Expand Down Expand Up @@ -315,7 +315,7 @@ file that was distributed with this source code.
</div>
<div class="ec-orderDelivery__address">
<p>{{ 'common.name.prefix'|trans }}{{ shipping.name01 }} {{ shipping.name02 }} {{ 'common.name.suffix'|trans }}</p>
<p>{{ 'common.postal_symbol'|trans }}{{ shipping.postal_code }} {{ shipping.pref }}{{ shipping.addr01 }}{{ shipping.addr02 }}</p>
<p>{{ format_address(shipping.addr01, shipping.addr02, shipping.pref, shipping.postal_code) }}</p>
<p>{{ shipping.phone_number }}</p>
</div>
<div class="ec-orderDelivery__actions">
Expand Down
2 changes: 1 addition & 1 deletion app/template/default/Shopping/nonmember.twig
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ file that was distributed with this source code.
<div class="ec-icon"><img
src="{{ asset('assets/icon/question-white.svg') }}" alt="">
</div>
</div><a href="https://www.post.japanpost.jp/zipcode/" target="_blank"><span>{{ 'common.search_postal_code'|trans }}</span></a>
</div><a href="{{ url('help_postalcode') }}" target="_blank"><span>{{ 'common.search_postal_code'|trans }}</span></a>
</div>
{{ form_errors(form.postal_code) }}
</div>
Expand Down
Loading

0 comments on commit 7aa694b

Please sign in to comment.