Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Merge branch 'fronkdev' into 'master'

Browse Source 
Address: changed country to country_id with Country table

See merge request fronk/thetool!255
This commit is contained in:
Frank Schubert
2024-02-20 19:21:37 +00:00
parent e1139b6d8e 20163e6008
commit 80cf3d2fc8
20 changed files with 455 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Layout/default/Address/Form.php
View File

@@ -89,7 +89,11 @@
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="country">Land</label>
<div class="col-lg-10">
<input type="text" class="form-control" name="country" id="country" value="<?=$address->country?>">
<select name="country_id" id="country_id" class="form-control">
<?php foreach(CountryModel::getAll() as $country): ?>
<option value="<?=$country->id?>" <?=(($address && $address->country_id == $country->id) || ((!$address || !$address->country_id) && $country->name == "Österreich")) ? "selected='selected'" : ""?>><?=$country->name?></option>
<?php endforeach; ?>
</select>
</div>
</div>
<div class="form-group row">
@@ -449,6 +453,7 @@
placeholder: ""
});
$("#addresstypes").select2();
$("#country_id").select2();
function validateIbanFormat(iban) {

2
Layout/default/Address/View.php
View File

@@ -55,7 +55,7 @@
<td><?=$address->zip?> <?=$address->city?></td>
</tr><tr>
<th>Land</th>
<td><?=$address->country?></td>
<td><?=$address->country->name?></td>
</tr><tr>
<th>Telefon</th>
<td><?=$address->phone?></td>

4
Layout/default/Emailtemplates/order/billing_external_energie.php
View File

@@ -74,7 +74,7 @@ PLZ: <?=$order->owner->zip?>
Ort: <?=$order->owner->city?>
Land: <?=$order->owner->country?>
Land: <?=$order->owner->country->name?>
Telefon: <?=$order->owner->phone?>
@@ -101,7 +101,7 @@ PLZ: <?=$order->billingaddress->zip?>
Ort: <?=$order->billingaddress->city?>
Land: <?=$order->billingaddress->country?>
Land: <?=$order->billingaddress->country->name?>
Telefon: <?=$order->billingaddress->phone?>

32
Layout/default/Order/Form.php
View File

@@ -122,12 +122,16 @@
<div class="row">
<div class="col-lg-12">
<div class="form-group">
<label class="form-label" for="owner_country">Land</label>
<input type="text" class="form-control" name="owner_country" id="owner_country" value="<?=$order->owner_country?>" />
<label class="form-label" for="owner_country_id">Land</label>
<select name="owner_country_id" id="owner_country_id" class="form-control">
<?php foreach($countries as $country): ?>
<option value="<?=$country->id?>" <?=(($order && $order->owner_country_id == $country->id) || ((!$order || !$order->owner_country_id) && $country->name == "Österreich")) ? "selected='selected'" : ""?>><?=$country->name?></option>
<?php endforeach; ?>
</select>
</div>
</div>
</div>
<div class="row">
<div class="col-lg-6">
<div class="form-group">
@@ -241,12 +245,16 @@
<div class="row">
<div class="col-lg-12">
<div class="form-group">
<label class="form-label" for="billing_country">Land</label>
<input type="text" class="form-control" name="billing_country" id="billing_country" value="<?=$order->billing_country?>" />
<label class="form-label" for="billing_country_id">Land</label>
<select name="billing_country_id" id="billing_country_id" class="form-control">
<?php foreach($countries as $country): ?>
<option value="<?=$country->id?>" <?=(($order && $order->billing_country_id == $country->id) || ((!$order || !$order->billing_country_id) && $country->name == "Österreich")) ? "selected='selected'" : ""?>><?=$country->name?></option>
<?php endforeach; ?>
</select>
</div>
</div>
</div>
<div class="row">
<div class="col-lg-6">
<div class="form-group">
@@ -362,8 +370,12 @@
<div class="row">
<div class="col-lg-12">
<div class="form-group">
<label class="form-label" for="techcontact_country">Land</label>
<input type="text" class="form-control" name="techcontact_country" id="techcontact_country" value="<?=$order->techcontact_country?>" />
<label class="form-label" for="techcontact_country_id">Land</label>
<select name="techcontact_country_id" id="techcontact_country_id" class="form-control">
<?php foreach($countries as $country): ?>
<option value="<?=$country->id?>" <?=(($order && $order->techcontact_country_id == $country->id) || ((!$order || !$order->techcontact_country_id) && $country->name == "Österreich")) ? "selected='selected'" : ""?>><?=$country->name?></option>
<?php endforeach; ?>
</select>
</div>
</div>
</div>
@@ -1360,8 +1372,8 @@
function validateOrderForm() {
var allFields = [
"owner_company", "owner_firstname", "owner_lastname", "owner_street", "owner_zip", "owner_city", "owner_country", "owner_phone", "owner_email",
"billing_company", "billing_firstname", "billing_lastname", "billing_street", "billing_zip", "billing_city", "billing_country", "billing_phone", "billing_email",
"owner_company", "owner_firstname", "owner_lastname", "owner_street", "owner_zip", "owner_city", "owner_country_id", "owner_phone", "owner_email",
"billing_company", "billing_firstname", "billing_lastname", "billing_street", "billing_zip", "billing_city", "billing_country_id", "billing_phone", "billing_email",
"order_date", "finish_after", "finish_after_comment", "billing_type", "bank_account_bank", "bank_account_owner", "bank_account_iban", "bank_account_bic"
];
var checkEmpty = [];

8
Layout/default/Order/Index.php
View File

@@ -401,7 +401,7 @@
<td><?=$order->owner->city?></td>
</tr><tr>
<th>Land</th>
<td><?=$order->owner->country?></td>
<td><?=$order->owner->country->name?></td>
</tr><tr>
<th>Telefon</th>
<td class="text-monospace"><?=($order->owner->phone) ? "<a href='tel:".$order->owner->phone."'>".$order->owner->phone."</a>" : ""?></td>
@@ -442,7 +442,7 @@
<td><?=$order->billingaddress->city?></td>
</tr><tr>
<th>Land</th>
<td><?=$order->billingaddress->country?></td>
<td><?=$order->billingaddress->country->name?></td>
</tr><tr>
<th>Telefon</th>
<td class="text-monospace"><?=($order->billingaddress->phone) ? "<a href='tel:".$order->billingaddress->phone."'>".$order->billingaddress->phone."</a>" : ""?></td>
@@ -852,7 +852,7 @@
<td><?=$order->owner->city?></td>
</tr><tr>
<th>Land</th>
<td><?=$order->owner->country?></td>
<td><?=$order->owner->country->name?></td>
</tr><tr>
<th>Telefon</th>
<td class="text-monospace"><?=($order->owner->phone) ? "<a href='tel:".$order->owner->phone."'>".$order->owner->phone."</a>" : ""?></td>
@@ -893,7 +893,7 @@
<td><?=$order->billingaddress->city?></td>
</tr><tr>
<th>Land</th>
<td><?=$order->billingaddress->country?></td>
<td><?=$order->billingaddress->country->name?></td>
</tr><tr>
<th>Telefon</th>
<td class="text-monospace"><?=($order->billingaddress->phone) ? "<a href='tel:".$order->billingaddress->phone."'>".$order->billingaddress->phone."</a>" : ""?></td>