Added Order Form and File
This commit is contained in:
Frank Schubert
@@ -1,3 +1,4 @@
|
||||
<?php //var_dump($order);exit; ?>
|
||||
<?php include(realpath(dirname(__FILE__)."/../")."/header.php"); ?>
|
||||
|
||||
<!-- start page title -->
|
||||
@@ -24,27 +25,29 @@
|
||||
<div class="card-body">
|
||||
<h4 class="header-title mb-2"><?=($order->id) ? "Bestellung bearbeiten" : "Neue Bestellung"?></h4>
|
||||
|
||||
<form class="form-horizontal" method="post" action="<?=self::getUrl("Order", "save")?>">
|
||||
<form class="form-horizontal" method="post" action="<?=self::getUrl("Order", "save")?>" enctype="multipart/form-data">
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
|
||||
<input type="hidden" name="id" value="<?=$order->id?>" />
|
||||
|
||||
|
||||
|
||||
<div class="row">
|
||||
<div class="col-lg-6">
|
||||
|
||||
|
||||
<div class="form-group row">
|
||||
|
||||
|
||||
|
||||
|
||||
<div class="col-lg-12 mb-2">
|
||||
<h4>Vertragsinhaber</h4>
|
||||
<select class="form-control" name="owner_id" id="owner_id">
|
||||
<option></option>
|
||||
<option value="new">Neu...</option>
|
||||
<option value="new" <?=($order->owner_id == "new") ? "selected='selected'" : ""?>>Neu...</option>
|
||||
<?php foreach($addresses as $address): ?>
|
||||
<option value="<?=$address->id?>"><?=$address->getCompanyOrName()?> (<?=$address->zip?> <?=$address->city?>, <?=$address->street?>)</option>
|
||||
<option value="<?=$address->id?>" <?=($address->id == $order->owner_id) ? "selected='selected'" : ""?>><?=$address->getCompanyOrName()?> (<?=$address->zip?> <?=$address->city?>, <?=$address->street?>)</option>
|
||||
<?php endforeach; ?>
|
||||
</select>
|
||||
</div>
|
||||
@@ -54,7 +57,7 @@
|
||||
<div class="col-lg-12">
|
||||
<div class="form-group">
|
||||
<label class="form-label" for="owner_company">Firmenname</label>
|
||||
<textarea class="form-control" name="owner_company" id="owner_company"></textarea>
|
||||
<textarea class="form-control" name="owner_company" id="owner_company"><?=$order->owner_company?></textarea>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -63,13 +66,13 @@
|
||||
<div class="col-lg-6">
|
||||
<div class="form-group">
|
||||
<label class="form-label" for="owner_firstname">Vorname</label>
|
||||
<input type="text" class="form-control" name="owner_firstname" id="owner_firstname" value="" />
|
||||
<input type="text" class="form-control" name="owner_firstname" id="owner_firstname" value="<?=$order->owner_firstname?>" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-lg-6">
|
||||
<div class="form-group">
|
||||
<label class="form-label" for="owner_lastname">Nachname</label>
|
||||
<input type="text" class="form-control" name="owner_lastname" id="owner_lastname" value="" />
|
||||
<input type="text" class="form-control" name="owner_lastname" id="owner_lastname" value="<?=$order->owner_lastname?>" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -77,8 +80,8 @@
|
||||
<div class="row">
|
||||
<div class="col-lg-12">
|
||||
<div class="form-group">
|
||||
<label class="form-label" for="owner_street">Straße</label>
|
||||
<input type="text" class="form-control" name="owner_street" id="owner_street" value="" />
|
||||
<label class="form-label" for="owner_street">Straße *</label>
|
||||
<input type="text" class="form-control" name="owner_street" id="owner_street" value="<?=$order->owner_street?>" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -86,14 +89,14 @@
|
||||
<div class="row">
|
||||
<div class="col-lg-3">
|
||||
<div class="form-group">
|
||||
<label class="form-label" for="owner_zip">Postleitzahl</label>
|
||||
<input type="text" class="form-control" name="owner_zip" id="owner_zip" value="" />
|
||||
<label class="form-label" for="owner_zip">Postleitzahl *</label>
|
||||
<input type="text" class="form-control" name="owner_zip" id="owner_zip" value="<?=$order->owner_zip?>" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-lg-9">
|
||||
<div class="form-group">
|
||||
<label class="form-label" for="owner_city">Ort</label>
|
||||
<input type="text" class="form-control" name="owner_city" id="owner_city" value="" />
|
||||
<label class="form-label" for="owner_city">Ort *</label>
|
||||
<input type="text" class="form-control" name="owner_city" id="owner_city" value="<?=$order->owner_city?>" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -102,7 +105,7 @@
|
||||
<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="" />
|
||||
<input type="text" class="form-control" name="owner_country" id="owner_country" value="<?=$order->owner_country?>" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -110,14 +113,14 @@
|
||||
<div class="row">
|
||||
<div class="col-lg-6">
|
||||
<div class="form-group">
|
||||
<label class="form-label" for="owner_phone">Telefon</label>
|
||||
<input type="text" class="form-control" name="owner_phone" id="owner_phone" value="" />
|
||||
<label class="form-label" for="owner_phone">Telefon *</label>
|
||||
<input type="text" class="form-control" name="owner_phone" id="owner_phone" value="<?=$order->owner_phone?>" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-lg-6">
|
||||
<div class="form-group">
|
||||
<label class="form-label" for="owner_mobile">Mobil</label>
|
||||
<input type="text" class="form-control" name="owner_mobile" id="owner_mobile" value="" />
|
||||
<input type="text" class="form-control" name="owner_mobile" id="owner_mobile" value="<?=$order->owner_mobile?>" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -125,14 +128,14 @@
|
||||
<div class="row">
|
||||
<div class="col-lg-6">
|
||||
<div class="form-group">
|
||||
<label class="form-label" for="owner_email">Emailadresse</label>
|
||||
<input type="text" class="form-control" name="owner_email" id="owner_email" value="" />
|
||||
<label class="form-label" for="owner_email">Emailadresse *</label>
|
||||
<input type="text" class="form-control" name="owner_email" id="owner_email" value="<?=$order->owner_email?>" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-lg-6">
|
||||
<div class="form-group">
|
||||
<label class="form-label" for="owner_fax">Fax</label>
|
||||
<input type="text" class="form-control" name="owner_fax" id="owner_fax" value="" />
|
||||
<input type="text" class="form-control" name="owner_fax" id="owner_fax" value="<?=$order->owner_fax?>" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -149,9 +152,9 @@
|
||||
<h4>Rechungsadresse</h4>
|
||||
<select class="form-control" name="billingaddress_id" id="billingaddress_id">
|
||||
<option></option>
|
||||
<option value="new">Neu...</option>
|
||||
<option value="new" <?=($order->billingaddress_id == "new") ? "selected='selected'" : ""?>>Neu...</option>
|
||||
<?php foreach($addresses as $address): ?>
|
||||
<option value="<?=$address->id?>"><?=$address->getCompanyOrName()?> (<?=$address->zip?> <?=$address->city?>, <?=$address->street?>)</option>
|
||||
<option value="<?=$address->id?>" <?=($address->id == $order->billingaddress_id) ? "selected='selected'" : ""?>><?=$address->getCompanyOrName()?> (<?=$address->zip?> <?=$address->city?>, <?=$address->street?>)</option>
|
||||
<?php endforeach; ?>
|
||||
</select>
|
||||
</div>
|
||||
@@ -161,7 +164,7 @@
|
||||
<div class="col-lg-12">
|
||||
<div class="form-group">
|
||||
<label class="form-label" for="owner_company">Firmenname</label>
|
||||
<textarea class="form-control" name="billing_company" id="billing_company"></textarea>
|
||||
<textarea class="form-control" name="billing_company" id="billing_company"><?=$order->billing_company?></textarea>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -170,13 +173,13 @@
|
||||
<div class="col-lg-6">
|
||||
<div class="form-group">
|
||||
<label class="form-label" for="billing_firstname">Vorname</label>
|
||||
<input type="text" class="form-control" name="billing_firstname" id="billing_firstname" value="" />
|
||||
<input type="text" class="form-control" name="billing_firstname" id="billing_firstname" value="<?=$order->billing_firstname?>" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-lg-6">
|
||||
<div class="form-group">
|
||||
<label class="form-label" for="billing_lastname">Nachname</label>
|
||||
<input type="text" class="form-control" name="billing_lastname" id="billing_lastname" value="" />
|
||||
<input type="text" class="form-control" name="billing_lastname" id="billing_lastname" value="<?=$order->billing_lastname?>" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -184,8 +187,8 @@
|
||||
<div class="row">
|
||||
<div class="col-lg-12">
|
||||
<div class="form-group">
|
||||
<label class="form-label" for="billing_street">Straße</label>
|
||||
<input type="text" class="form-control" name="billing_street" id="billing_street" value="" />
|
||||
<label class="form-label" for="billing_street">Straße *</label>
|
||||
<input type="text" class="form-control" name="billing_street" id="billing_street" value="<?=$order->billing_street?>" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -193,14 +196,14 @@
|
||||
<div class="row">
|
||||
<div class="col-lg-3">
|
||||
<div class="form-group">
|
||||
<label class="form-label" for="billing_zip">Postleitzahl</label>
|
||||
<input type="text" class="form-control" name="billing_zip" id="billing_zip" value="" />
|
||||
<label class="form-label" for="billing_zip">Postleitzahl *</label>
|
||||
<input type="text" class="form-control" name="billing_zip" id="billing_zip" value="<?=$order->billing_zip?>" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-lg-9">
|
||||
<div class="form-group">
|
||||
<label class="form-label" for="billing_city">Ort</label>
|
||||
<input type="text" class="form-control" name="billing_city" id="billing_city" value="" />
|
||||
<label class="form-label" for="billing_city">Ort *</label>
|
||||
<input type="text" class="form-control" name="billing_city" id="billing_city" value="<?=$order->billing_city?>" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -209,7 +212,7 @@
|
||||
<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="" />
|
||||
<input type="text" class="form-control" name="billing_country" id="billing_country" value="<?=$order->billing_country?>" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -217,14 +220,14 @@
|
||||
<div class="row">
|
||||
<div class="col-lg-6">
|
||||
<div class="form-group">
|
||||
<label class="form-label" for="billing_phone">Telefon</label>
|
||||
<input type="text" class="form-control" name="billing_phone" id="billing_phone" value="" />
|
||||
<label class="form-label" for="billing_phone">Telefon *</label>
|
||||
<input type="text" class="form-control" name="billing_phone" id="billing_phone" value="<?=$order->billing_phone?>" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-lg-6">
|
||||
<div class="form-group">
|
||||
<label class="form-label" for="billing_mobile">Mobil</label>
|
||||
<input type="text" class="form-control" name="billing_mobile" id="billing_mobile" value="" />
|
||||
<input type="text" class="form-control" name="billing_mobile" id="billing_mobile" value="<?=$order->billing_mobile?>" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -232,14 +235,14 @@
|
||||
<div class="row">
|
||||
<div class="col-lg-6">
|
||||
<div class="form-group">
|
||||
<label class="form-label" for="billing_email">Emailadresse</label>
|
||||
<input type="text" class="form-control" name="billing_email" id="billing_email" value="" />
|
||||
<label class="form-label" for="billing_email">Emailadresse *</label>
|
||||
<input type="text" class="form-control" name="billing_email" id="billing_email" value="<?=$order->billing_email?>" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-lg-6">
|
||||
<div class="form-group">
|
||||
<label class="form-label" for="billing_fax">Fax</label>
|
||||
<input type="text" class="form-control" name="billing_fax" id="billing_fax" value="" />
|
||||
<input type="text" class="form-control" name="billing_fax" id="billing_fax" value="<?=$order->billing_fax?>" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -248,6 +251,15 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr />
|
||||
|
||||
<div class="form-group row">
|
||||
<label class="col-lg-2 col-form-label" for="order_date">Bestelldatum</label>
|
||||
<div class="col-lg-4">
|
||||
<input type="text" class="form-control" name="order_date" id="order_date" value="<?=($order->order_date) ? date("d.m.Y", $order->order_date) : date("d.m.Y")?>" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -257,11 +269,11 @@
|
||||
<div class="card-body">
|
||||
|
||||
<div class="form-group row">
|
||||
<label class="col-lg-2 col-form-label" for="description">Rechnungsart</label>
|
||||
<label class="col-lg-2 col-form-label" for="billing_type">Verrechnungsart</label>
|
||||
<div class="col-lg-10">
|
||||
<select class="form-control" name="billing_type">
|
||||
<option value="sepa">SEPA Bankeinzug</option>
|
||||
<option value="invoice">Rechnung</option>
|
||||
<select class="form-control" name="billing_type" id="billing_type">
|
||||
<option value="sepa" <?=($order->billing_type == "sepa") ? "selected='selected'" : ""?>>SEPA Bankeinzug</option>
|
||||
<option value="invoice" <?=($order->billing_type != "sepa") ? "selected='selected'" : ""?>>Rechnung</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
@@ -269,28 +281,28 @@
|
||||
<div class="form-group row">
|
||||
<label class="col-lg-2 col-form-label" for="bank_account_bank">Kreitinstitut</label>
|
||||
<div class="col-lg-10">
|
||||
<input type="text" class="form-control" name="bank_account_bank" id="bank_account_bank" value="" />
|
||||
<input type="text" class="form-control" name="bank_account_bank" id="bank_account_bank" value="<?=$order->bank_account_bank?>" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group row">
|
||||
<label class="col-lg-2 col-form-label" for="bank_account_owner">Kontoinhaber</label>
|
||||
<div class="col-lg-10">
|
||||
<input type="text" class="form-control" name="bank_account_owner" id="bank_account_owner" value="" />
|
||||
<input type="text" class="form-control" name="bank_account_owner" id="bank_account_owner" value="<?=$order->bank_account_owner?>" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group row">
|
||||
<label class="col-lg-2 col-form-label" for="bank_account_iban">IBAN</label>
|
||||
<div class="col-lg-10">
|
||||
<input type="text" class="form-control" name="bank_account_iban" id="bank_account_iban" value="" />
|
||||
<input type="text" class="form-control" name="bank_account_iban" id="bank_account_iban" value="<?=$order->bank_account_iban?>" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group row">
|
||||
<label class="col-lg-2 col-form-label" for="bank_account_bic">BIC</label>
|
||||
<div class="col-lg-10">
|
||||
<input type="text" class="form-control" name="bank_account_bic" id="bank_account_bic" value="" />
|
||||
<input type="text" class="form-control" name="bank_account_bic" id="bank_account_bic" value="<?=$order->bank_account_bic?>" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -302,18 +314,214 @@
|
||||
<div class="form-group row">
|
||||
<div class="col-lg-2"></div>
|
||||
<div class="col-lg-10">
|
||||
<label class="form-check-label"><input type="checkbox" class="form-check-input" name="allow_contact" id="allow_contact" /> Informationen per Post/Email/Telefon</label>
|
||||
<label class="form-check-label"><input type="checkbox" class="form-check-input" name="allow_contact" id="allow_contact" <?=($order->allow_contact) ? "checked='checked'" : ""?> /> Informationen per Post/Email/Telefon</label>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row">
|
||||
<div class="col-lg-2"></div>
|
||||
<div class="col-lg-10">
|
||||
<label class="form-check-label"><input type="checkbox" class="form-check-input" name="allow_spin" id="allow_contact" /> Auskunft mit Service PIN</label>
|
||||
<label class="form-check-label"><input type="checkbox" class="form-check-input" name="allow_spin" id="allow_spin" <?=($order->allow_spin) ? "checked='checked'" : ""?> /> Auskunft mit Service PIN</label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
<h4>Produkte</h4>
|
||||
|
||||
<?php foreach($order->products as $product): ?>
|
||||
<div class="row product-container">
|
||||
<div class="col-md-1 product-<?=$product->id?>">
|
||||
<!-- pos number -->
|
||||
<div class="form-group">
|
||||
<label class="form-label" for="pos-<?=$product->id?>">Position</label>
|
||||
<input type="number" class="form-control" name="products[<?=$product->id?>][pos]" id="pos-<?=$product->id?>" value="<?=$product->pos?>" placeholder="Position" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-md-11">
|
||||
<!-- product lines -->
|
||||
<div class="row">
|
||||
<!-- line 1 -->
|
||||
<div class="col-5">
|
||||
<label class="form-label" for="product_id-<?=$product->id?>">Produkt</label>
|
||||
<select name="products[<?=$product->id?>][product_id]" id="product_id-<?=$product->id?>" class="form-control" onchange="updateProduct(<?=$product->id?>)">
|
||||
<option></option>
|
||||
<?php foreach($products as $p): ?>
|
||||
<option value="<?=$p->id?>" <?=($p->id == $product->product_id) ? "selected='selected'" : ""?>><?=$p->name?></option>
|
||||
<?php endforeach; ?>
|
||||
</select>
|
||||
|
||||
</div>
|
||||
<div class="col-3">
|
||||
<label class="form-label" for="amount-<?=$product->id?>">Anzahl/Menge</label>
|
||||
<input type="text" class="form-control" name="products[<?=$product->id?>][amount]" id="amount-<?=$product->id?>" value="<?=$product->formatAmount()?>" placeholder="Anzahl/Menge" />
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<label class="form-label" for="billing_period-<?=$product->id?>" >Verrechungsperiode</label>
|
||||
<select class="form-control" name="products[<?=$product->id?>][billing_period]" id="billing_period-<?=$product->id?>" placeholder="Verrechnungsperiode">
|
||||
<option value="12" <?=($product->billing_period == 12) ? "selected='selected'" : ""?>>Monatlich</option>
|
||||
<option value="1"> <?=($product->billing_period == 1 ? "selected='selected'" : "")?>Jährlich</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<label class="form-label" for="price-<?=$product->id?>" >Preis p. Periode</label>
|
||||
<input type="text" class="form-control" name="products[<?=$product->id?>][price]" id="price-<?=$product->id?>" value="<?=$this::dotToComma($product->price)?>" placeholder="Preis p. Periode" />
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="row mt-1 mb-2">
|
||||
<!-- line 2 -->
|
||||
<div class="col-10">
|
||||
<label class="form-label" for="description-<?=$product->id?>" >Zusatztext</label>
|
||||
<textarea class="form-control" name="products[<?=$product->id?>][description]" id="description-<?=$product->id?>" placeholder="Zusatztext"><?=$product->description?></textarea>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<label class="form-label" for="price_setup-<?=$product->id?>" >Preis Setup</label>
|
||||
<input type="text" class="form-control" name="products[<?=$product->id?>][price_setup]" id="price_setup-<?=$product->id?>" value="<?=$this::dotToComma($product->price_setup)?>" placeholder="Preis Setup" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<?php endforeach; ?>
|
||||
|
||||
<div class="row product-container">
|
||||
|
||||
<div class="col-md-1 product-new">
|
||||
<!-- pos number -->
|
||||
<div class="form-group">
|
||||
<label class="form-label" for="pos-new" >Position</label>
|
||||
<input type="number" class="form-control" name="products[new][pos]" id="pos-new" value="" placeholder="Position" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-md-11">
|
||||
<!-- product lines -->
|
||||
<div class="row">
|
||||
<!-- line 1 -->
|
||||
<div class="col-5">
|
||||
<label class="form-label" for="product_id-new" >Produkt</label>
|
||||
<select name="products[new][product_id]" id="product_id-new" class="form-control" onchange="updateProduct('new')">
|
||||
<option></option>
|
||||
<?php foreach($products as $p): ?>
|
||||
<option value="<?=$p->id?>" <?=($p->id == $product->id) ? "checked='checked'" : ""?>><?=$p->name?></option>
|
||||
<?php endforeach; ?>
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-3">
|
||||
<label class="form-label" for="amount-new">Anzahl/Menge</label>
|
||||
<input type="text" class="form-control" name="products[new][amount]" id="amount-new" value="" placeholder="Anzahl/Menge (Standard: 1)" />
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<label class="form-label" for="billing_period-new" >Verrechungsperiode</label>
|
||||
<select class="form-control" name="products[new][billing_period]" id="billing_period-new" placeholder="Verrechnungsperiode">
|
||||
<option value="12">Monatlich</option>
|
||||
<option value="1">Jährlich</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<label class="form-label" for="price-new" >Preis p. Periode</label>
|
||||
<input type="text" class="form-control" name="products[new][price]" id="price-new" value="" placeholder="Preis p. Periode" />
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="row mt-1 mb-2">
|
||||
<!-- line 2 -->
|
||||
<div class="col-10">
|
||||
<label class="form-label" for="description-new" >Zusatztext</label>
|
||||
<textarea class="form-control" name="products[new][description]" id="description-new" placeholder="Zusatztext"></textarea>
|
||||
</div>
|
||||
|
||||
<div class="col-2">
|
||||
<label class="form-label" for="price_setup-new" >Preis Setup</label>
|
||||
<input type="text" class="form-control" name="products[new][price_setup]" id="price_setup-new" value="" placeholder="Preis Setup" />
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<h4>Dokumente</h4>
|
||||
|
||||
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
<?php if(!$order->id): ?>
|
||||
<i>Verfügbar nach speichern.</i>
|
||||
<?php else: ?>
|
||||
|
||||
<?php if(is_array($order->files) && count($order->files)): ?>
|
||||
<table class="table table-striped table-hover">
|
||||
<tr>
|
||||
<th>Name</th>
|
||||
<th>Beschreibung</th>
|
||||
<th>Dateiname</th>
|
||||
<th>Original Dateiname</th>
|
||||
<th>Hochgeladen</th>
|
||||
<th>Zuletzt bearbeitet</th>
|
||||
<th></th>
|
||||
</tr>
|
||||
<?php foreach($order->files as $file): ?>
|
||||
<tr>
|
||||
<td><a href="<?=self::getUrl("File", "Download", ['id' => $file->file->id])?>"><?=$file->name?></a></td>
|
||||
<td><?=nl2br($file->description)?></td>
|
||||
<td><?=$file->file->filename?></td>
|
||||
<td><?=$file->file->orig_filename?></td>
|
||||
<td class="text-monospace"><?=date("d.m.Y", $file->create)?> (<?=$file->creator->name?>)</td>
|
||||
<td class="text-monospace"><?=date("d.m.Y", $file->edit)?> (<?=$file->editor->name?>)</td>
|
||||
<td>
|
||||
<a href="<?=self::getUrl("OrderFile", "edit", ["id" => $file->id])?>"><i class="far fa-edit" title="Bearbeiten"></i></a>
|
||||
<a href="<?=self::getUrl("OrderFile", "delete", ["id" => $file->id])?>" onclick="if(!confirm('Dokument wirklich löschen?')) return false;" class="text-danger" title="Löschen"><i class="fas fa-trash"></i></a>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<?php endforeach; ?>
|
||||
</table>
|
||||
<?php endif; ?>
|
||||
|
||||
<h4>Neues Dokument</h4>
|
||||
<div class="form-group row">
|
||||
<label class="col-lg-2 col-form-label" for="file_name">Name</label>
|
||||
<div class="col-lg-10">
|
||||
<input type="text" class="form-control" name="file_name" id="file_name" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group row">
|
||||
<label class="col-lg-2 col-form-label" for="file_filename">Download Dateiname</label>
|
||||
<div class="col-lg-10">
|
||||
<input type="text" class="form-control" name="file_filename" id="file_filename" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group row">
|
||||
<label class="col-lg-2 col-form-label" for="file_description">Beschreibung</label>
|
||||
<div class="col-lg-10">
|
||||
<textarea class="form-control" name="file_description"></textarea>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group row">
|
||||
<label class="col-lg-2 col-form-label" for="note">Datei auswählen</label>
|
||||
<div class="col-lg-10">
|
||||
<input type="file" name="OrderFileUpload" class="form-control" />
|
||||
<small>Erlaubte Dateiendungen: <?=MFUPLOAD_ALLOWED_EXTENSIONS_STR?></small>
|
||||
</div>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
<div class="form-group row">
|
||||
@@ -342,18 +550,16 @@
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
<script type="text/javascript">
|
||||
$("#productgroup_id").select2({
|
||||
$("#owner_id").select2({
|
||||
allowClear: true,
|
||||
placeholder: ""
|
||||
});
|
||||
$("#producttech_id").select2({
|
||||
allowClear: true,
|
||||
placeholder: ""
|
||||
});
|
||||
$("#networks").select2({
|
||||
$("#billingaddress_id").select2({
|
||||
allowClear: true,
|
||||
placeholder: ""
|
||||
});
|
||||
@@ -378,6 +584,49 @@
|
||||
}
|
||||
});
|
||||
|
||||
$('#order_date').datepicker({
|
||||
language: 'de',
|
||||
format: "dd.mm.yyyy",
|
||||
showWeekDays: true,
|
||||
todayBtn: 'linked',
|
||||
autoclose: true
|
||||
});
|
||||
|
||||
|
||||
// disable mousewheel on input number field when in focus
|
||||
$('form').on('focus', 'input[type=number]', function (e) {
|
||||
$(this).on('wheel.disableScroll', function (e) {
|
||||
e.preventDefault()
|
||||
})
|
||||
});
|
||||
$('form').on('blur', 'input[type=number]', function (e) {
|
||||
$(this).off('wheel.disableScroll')
|
||||
});
|
||||
|
||||
function updateProduct(id) {
|
||||
var pid = $('#product_id-' + id).val();
|
||||
|
||||
$.get("<?=self::getUrl("Product", "Api")?>",
|
||||
{
|
||||
"do": "getProduct",
|
||||
product_id: pid,
|
||||
form_id: id
|
||||
},
|
||||
function (success) {
|
||||
//console.log(success);
|
||||
p = success.result.product;
|
||||
id = success.result.form_id;
|
||||
|
||||
$('#billing_period-' + id).val(p.billing_period);
|
||||
$('#price-' + id).val(p.price);
|
||||
$('#price_setup-' + id).val(p.price_setup);
|
||||
},
|
||||
'json');
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
</script>
|
||||
|
||||
<?php include(realpath(dirname(__FILE__)."/../")."/footer.php"); ?>
|
||||
@@ -33,8 +33,7 @@
|
||||
<th>Kunde</th>
|
||||
<th>Adresse</th>
|
||||
<th>Anschlussadresse</th>
|
||||
<th>Kontakt</th>
|
||||
<th>Bestellt am</th>
|
||||
<th>Bestelldatum</th>
|
||||
<th>Zuletzt bearbeitet</th>
|
||||
<th>Bearbeitet von</th>
|
||||
<th></th>
|
||||
@@ -50,9 +49,8 @@
|
||||
<?=$order->termination->building->street?><?=($order->termination->name) ? " ".$order->termination->name : ""?><br />
|
||||
<?=$order->termination->building->zip?> <?=$order->termination->building->city?>
|
||||
</td>
|
||||
<td><?=$order->contact->getCompanyOrName()?></td>
|
||||
<td class="text-monospace"><?=$order->create?></td>
|
||||
<td class="text-monospace"><?=$order->edit?></td>
|
||||
<td class="text-monospace"><?=date("d.m.Y", $order->order_date)?></td>
|
||||
<td class="text-monospace"><?=date("d.m.Y", $order->edit)?></td>
|
||||
<td class="text-monospace"><?=$order->editor->name?></td>
|
||||
<td style="text-align: left; letter-spacing: 4px; font-size: 1.1em;">
|
||||
<a href="<?=self::getUrl("Order", "edit", ["id" => $order->id])?>"><i class="far fa-edit" title="Bearbeiten"></i></a>
|
||||
|
||||
@@ -17,11 +17,13 @@
|
||||
<link href="<?=self::getResourcePath()?>assets/css/app.css" rel="stylesheet" type="text/css" />
|
||||
<link href="<?=self::getResourcePath()?>assets/css/leaflet.css" rel="stylesheet" type="text/css" />
|
||||
<link href="<?=self::getResourcePath()?>assets/css/thetool.css?<?=date('U')?>" rel="stylesheet" type="text/css" />
|
||||
|
||||
<link href="<?=self::getResourcePath()?>assets/libs/select2/select2.min.css" rel="stylesheet" type="text/css" />
|
||||
<link href="<?=self::getResourcePath()?>css/bootstrap-datepicker3.min.css" rel="stylesheet" type="text/css" />
|
||||
|
||||
<script type="text/javascript" src="<?=self::getResourcePath()?>js/jquery.min.js"></script>
|
||||
<script type="text/javascript" src="<?=self::getResourcePath()?>assets/libs/select2/select2.min.js"></script>
|
||||
<script src="<?=self::getResourcePath()?>js/bootstrap-datepicker.min.js"></script>
|
||||
<script src="<?=self::getResourcePath()?>js/bootstrap-datepicker.de.min.js"></script>
|
||||
<script type="text/javascript" src="<?=self::getResourcePath()?>assets/js/leaflet.js"></script>
|
||||
<script type="text/javascript" src="<?=self::getResourcePath()?>js/bootstrap.min.js"></script>
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@ class AddressModel {
|
||||
|
||||
foreach($data as $field => $value) {
|
||||
if(property_exists(get_called_class(), $field)) {
|
||||
$model ->$field = $value;
|
||||
$model->$field = $value;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -39,6 +39,10 @@ class AddressModel {
|
||||
$model->edit_by = $me->id;
|
||||
}
|
||||
|
||||
if(!array_key_exists("note", $data)) {
|
||||
$model->note = "";
|
||||
}
|
||||
|
||||
return $model;
|
||||
}
|
||||
|
||||
@@ -77,6 +81,7 @@ class AddressModel {
|
||||
$db = FronkDB::singleton();
|
||||
|
||||
$where = self::getSqlFilter($filter);
|
||||
$have = [];
|
||||
$sql = "SELECT Address.* FROM Address, Addresstype
|
||||
WHERE Addresstype.address_id = Address.id
|
||||
AND $where
|
||||
@@ -86,8 +91,17 @@ class AddressModel {
|
||||
if($db->num_rows($res)) {
|
||||
while($data = $db->fetch_object($res)) {
|
||||
$items[] = new Address($data);
|
||||
$have[] = $data->id;
|
||||
}
|
||||
}
|
||||
|
||||
$res = $db->select("Address", "*", "$where AND id NOT IN (".implode(",", $have).")");
|
||||
if($db->num_rows()) {
|
||||
while($data = $db->fetch_object($res)) {
|
||||
$items[] = new Address($data);
|
||||
}
|
||||
}
|
||||
|
||||
return $items;
|
||||
}
|
||||
|
||||
|
||||
@@ -2,4 +2,30 @@
|
||||
|
||||
class File extends mfBaseModel {
|
||||
|
||||
|
||||
public function delete() {
|
||||
if($this->id) {
|
||||
$id = $this->id;
|
||||
|
||||
// delete file in store
|
||||
$path = MFUPLOAD_FILE_SAVE_PATH."/documents/".$this->store_filename;
|
||||
if(!unlink($path)) {
|
||||
$this->log->warn(__CLASS__."::delete(): Error unlinking file ($path)");
|
||||
}
|
||||
|
||||
$where = "id=$id";
|
||||
if($this->fieldprefix && !strstr($field,"_")) {
|
||||
$where = $this->fieldprefix."_id=$id";
|
||||
}
|
||||
if($this->db->delete($this->table,$where)) {
|
||||
if(method_exists($this, "afterDelete")) {
|
||||
$this->afterDelete();
|
||||
}
|
||||
$this->data = new stdClass();
|
||||
$this->id = "";
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -13,4 +13,60 @@ class FileController extends mfBaseController {
|
||||
$this->redirect("Dashboard");
|
||||
}*/
|
||||
}
|
||||
|
||||
|
||||
protected function downloadAction() {
|
||||
$id = $this->request->id;
|
||||
if(!is_numeric($id) || $id < 1) {
|
||||
return true;
|
||||
}
|
||||
|
||||
$file = new File($id);
|
||||
if(!$file) {
|
||||
throw new Exception("File not found", 404);
|
||||
}
|
||||
$filename = $file->store_filename;
|
||||
$path = MFUPLOAD_FILE_SAVE_PATH."/documents/$filename";
|
||||
|
||||
//var_dump($path);exit;
|
||||
if(!file_exists($path)) {
|
||||
throw new Exception("File not found", 4041);
|
||||
}
|
||||
|
||||
if(preg_match('/\.([^.]+)/',$filename,$m)) {
|
||||
$ext .= $m[1];
|
||||
} else {
|
||||
throw new Exception("File not found", 4042);
|
||||
}
|
||||
|
||||
$outname = ($file->filename) ? $file->filename : $file->orig_filename;
|
||||
|
||||
if(!$this->sendfile($path, $outname)) {
|
||||
throw new Exception("File not found", 4043);
|
||||
}
|
||||
exit;
|
||||
}
|
||||
|
||||
private function sendfile($file,$name) {
|
||||
$this->log->debug("sendfile: $file $name");
|
||||
if (!$fh = fopen($file, 'r')) {
|
||||
return false;
|
||||
}
|
||||
|
||||
set_time_limit(36000);
|
||||
header('Content-Type: application/octet-stream');
|
||||
header('Content-disposition: attachment; filename="' . $name . '"');
|
||||
|
||||
$size = exec('stat -c %s '.escapeshellarg($file));
|
||||
if($size < (pow(2,31))-1) {
|
||||
header('Content-Length: ' . $size);
|
||||
}
|
||||
|
||||
while (!feof($fh)) {
|
||||
$data = fread($fh, 8192);
|
||||
echo $data;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -4,6 +4,7 @@ class FileModel {
|
||||
public $name;
|
||||
public $description;
|
||||
public $filename;
|
||||
public $store_filename;
|
||||
public $orig_filename;
|
||||
public $subfolder;
|
||||
|
||||
|
||||
@@ -3,55 +3,61 @@
|
||||
class Order extends mfBaseModel {
|
||||
private $owner;
|
||||
private $billingaddress;
|
||||
private $products;
|
||||
private $files;
|
||||
private $creator;
|
||||
private $editor;
|
||||
|
||||
|
||||
public function getNewPos() {
|
||||
if(!$this->id) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
$p = end($this->getProperty("products"));
|
||||
return ++$p->pos;
|
||||
}
|
||||
|
||||
public function getProperty($name) {
|
||||
if($this->$name == null) {
|
||||
|
||||
|
||||
if(!$this->id) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if($name == "owner") {
|
||||
if($this->id) {
|
||||
$this->owner = new Address($this->owner_id);
|
||||
return $this->owner;
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
$this->owner = new Address($this->owner_id);
|
||||
return $this->owner;
|
||||
}
|
||||
|
||||
if($name == "contact") {
|
||||
if($this->id) {
|
||||
$this->contact = new Address($this->contact_id);
|
||||
return $this->contact;
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
$this->contact = new Address($this->contact_id);
|
||||
return $this->contact;
|
||||
}
|
||||
|
||||
if($name == "billingaddress") {
|
||||
if($this->id) {
|
||||
$this->billingaddress = new Address($this->billingaddress_id);
|
||||
return $this->billingaddress;
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
$this->billingaddress = new Address($this->billingaddress_id);
|
||||
return $this->billingaddress;
|
||||
}
|
||||
|
||||
if($name == "products") {
|
||||
$this->products = OrderProductModel::search(["order_id" => $this->id]);
|
||||
return $this->products;
|
||||
}
|
||||
|
||||
if($name == "files") {
|
||||
$this->files = OrderFileModel::search(['order_id' => $this->id]);
|
||||
return $this->files;
|
||||
}
|
||||
|
||||
if($name == "creator") {
|
||||
if($this->id) {
|
||||
$this->creator = new User($this->create_by);
|
||||
return $this->creator;
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
$this->creator = new User($this->create_by);
|
||||
return $this->creator;
|
||||
}
|
||||
|
||||
if($name == "editor") {
|
||||
if($this->id) {
|
||||
$this->editor = new User($this->edit_by);
|
||||
return $this->editor;
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
$this->editor = new User($this->edit_by);
|
||||
return $this->editor;
|
||||
}
|
||||
|
||||
$classname = ucfirst($name);
|
||||
|
||||
@@ -23,5 +23,312 @@ class OrderController extends mfBaseController {
|
||||
protected function addAction() {
|
||||
$this->layout()->setTemplate("Order/Form");
|
||||
$this->layout()->set("addresses", AddressModel::search(['parents_only' => 1]));
|
||||
$this->layout()->set("products", ProductModel::getAll());
|
||||
|
||||
|
||||
}
|
||||
|
||||
protected function editAction() {
|
||||
$order_id = $this->request->id;
|
||||
$order = new Order($order_id);
|
||||
if(!$order->id) {
|
||||
$this->layout()->setFlash("Bestellung nicht gefunden.", "error");
|
||||
$this->redirect("Order");
|
||||
}
|
||||
|
||||
$this->layout()->set("order", $order);
|
||||
|
||||
return $this->addAction();
|
||||
}
|
||||
|
||||
protected function saveAction() {
|
||||
$r = $this->request;
|
||||
//var_dump($r->products);
|
||||
//var_dump($r);
|
||||
//exit;
|
||||
$id = $r->id;
|
||||
if(is_numeric($id) && $id > 0) {
|
||||
$mode = "edit";
|
||||
$order = new Order($id);
|
||||
if(!$order->id) {
|
||||
$this->layout()->setFlash("Bestellung nicht gefunden", "error");
|
||||
$this->redirect("Order");
|
||||
}
|
||||
} else {
|
||||
$id = false;
|
||||
$mode = "add";
|
||||
}
|
||||
|
||||
// validate owner
|
||||
$owner = false;
|
||||
if(!$r->owner_id) {
|
||||
$this->layout()->setFlash("Bitte Vertragsinhaber auswählen oder eintragen.", "error");
|
||||
$this->layout()->set("order", $r);
|
||||
return $this->add();
|
||||
}
|
||||
|
||||
if(is_numeric($r->owner_id)) {
|
||||
$owner = new Address($r->owner_id);
|
||||
if(!$owner->id) {
|
||||
$this->layout()->setFlash("Ungültiger Vertragsinhaber.", "error");
|
||||
$this->layout()->set("order", $r);
|
||||
return $this->add();
|
||||
}
|
||||
} elseif($r->owner_id == "new") {
|
||||
if(!$r->owner_company && !($r->owner_firstname && $r->owner_lastname)) {
|
||||
$this->layout()->setFlash("Fehler in Vertragsinhaber: Firmenname oder Vor- und Nachname benötigt.");
|
||||
$this->layout()->set("order", $r);
|
||||
return $this->add();
|
||||
}
|
||||
|
||||
foreach(["street", "zip", "city", "phone", "email"] as $required) {
|
||||
if(!$r->{"owner_$required"}) {
|
||||
$this->layout()->setFlash("Fehler in Vertragsinhaber: Bitte alle benötigten Felder ausfüllen.");
|
||||
$this->layout()->set("order", $r);
|
||||
return $this->add();
|
||||
}
|
||||
}
|
||||
} else {
|
||||
$this->layout()->setFlash("Ungültiger Vertragsinhaber.");
|
||||
$this->layout()->set("order", $r);
|
||||
return $this->add();
|
||||
}
|
||||
|
||||
|
||||
// validate billindaddress
|
||||
$billingaddress = false;
|
||||
if($r->billingaddress_id) {
|
||||
// billingaddress can be empty
|
||||
if(is_numeric($r->billingaddress_id)) {
|
||||
$billingaddress = new Address($r->billingaddress_id);
|
||||
if(!$billingaddress->id) {
|
||||
$this->layout()->setFlash("Ungültiger Rechnungsempfänger.", "error");
|
||||
$this->layout()->set("order", $r);
|
||||
return $this->add();
|
||||
}
|
||||
} elseif($r->billingaddress_id == "new") {
|
||||
if(!$r->billing_company && !($r->billingr_firstname && $r->billing_lastname)) {
|
||||
$this->layout()->setFlash("Fehler in Rechnungsqmpfänger: Firmenname oder Vor- und Nachname benötigt.");
|
||||
$this->layout()->set("order", $r);
|
||||
return $this->add();
|
||||
}
|
||||
|
||||
foreach(["street", "zip", "city", "phone", "email"] as $required) {
|
||||
if(!$r->{"owner_$required"}) {
|
||||
$this->layout()->setFlash("Fehler in Rechnungsempfänger: Bitte alle benötigten Felder ausfüllen.");
|
||||
$this->layout()->set("order", $r);
|
||||
return $this->add();
|
||||
}
|
||||
}
|
||||
} else {
|
||||
$this->layout()->setFlash("Ungültiger Rechnungsempfänger.");
|
||||
$this->layout()->set("order", $r);
|
||||
return $this->add();
|
||||
}
|
||||
}
|
||||
|
||||
// validate sepa
|
||||
if(!$r->billing_type) {
|
||||
$this->layout()->setFlash("Ungültige Verrechnungsart.");
|
||||
$this->layout()->set("order", $r);
|
||||
return $this->add();
|
||||
}
|
||||
|
||||
if($r->billing_type == "sepa") {
|
||||
foreach(['bank', 'owner', 'iban', 'bic'] as $required) {
|
||||
if(!$r->{"bank_account_$required"}) {
|
||||
$this->layout()->setFlash("Bitte Bankdaten für SEPA ausfüllen.");
|
||||
$this->layout()->set("order", $r);
|
||||
return $this->add();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// create objects for saving (if new) but don't save yet
|
||||
$owner_data = [];
|
||||
$billing_data = [];
|
||||
|
||||
$request = $r->get();
|
||||
foreach($request as $field => $value) {
|
||||
$m = [];
|
||||
if(preg_match('/([a-z0-9]+)_(.+)/i', $field, $m)) {
|
||||
if($m[1] == "owner" && !$owner) {
|
||||
$owner_data[$m[2]] = $value;
|
||||
}
|
||||
if($m[1] == "billing" && !$billingaddress) {
|
||||
$billing_data[$m[2]] = $value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(!$owner) {
|
||||
$owner = AddressModel::create($owner_data);
|
||||
}
|
||||
if(!$billingaddress) {
|
||||
$billingaddress = AddressModel::create($billing_data);
|
||||
}
|
||||
|
||||
// create or save Order object
|
||||
|
||||
$order_data = [];
|
||||
if(is_numeric($r->owner_id)) {
|
||||
$order_data['owner_id'] = $r->owner_id;
|
||||
}
|
||||
if(is_numeric($r->billingaddress_id)) {
|
||||
$order_data['billingaddress_id'] = $r->billingaddress_id;
|
||||
}
|
||||
$order_data['billing_type'] = $r->billing_type;
|
||||
$order_data['bank_account_bank'] = $r->bank_account_bank;
|
||||
$order_data['bank_account_owner'] = $r->bank_account_owner;
|
||||
$order_data['bank_account_iban'] = $r->bank_account_iban;
|
||||
$order_data['bank_account_bic'] = $r->bank_account_bic;
|
||||
$order_data['allow_contact'] = ($r->allow_contact) ? 1 : 0;
|
||||
$order_data['allow_spin'] = ($r->allow_spin) ? 1 : 0;
|
||||
$order_data['note'] = $r->note;
|
||||
|
||||
$order_date = $r->order_date;
|
||||
|
||||
if(!preg_match('/^(\d\d)\.(\d\d)\.(\d\d\d\d)$/',$order_date, $m)) {
|
||||
$errors[] = "Ungültiges Bestelldateum";
|
||||
} else {
|
||||
$day = intval($m[1]);
|
||||
$month = intval($m[2]);
|
||||
$year = intval($m[3]);
|
||||
|
||||
if($day > 31 || $day < 1
|
||||
|| $month > 12 || $month < 1
|
||||
|| $year > date('Y')+1 || $year < date('Y'))
|
||||
{
|
||||
$this->layout()->setFlash("Ungültiges Bestelldatum");
|
||||
$this->layout()->set("Order", $r);
|
||||
return $this->add();
|
||||
}
|
||||
|
||||
$order_date_ts = mktime(0,0,0,$month,$day,$year);
|
||||
$order_data['order_date'] = $order_date_ts;
|
||||
}
|
||||
|
||||
$order_data['edit_by'] = $this->me->id;
|
||||
|
||||
if($mode == "add") {
|
||||
$order = OrderModel::create($order_data);
|
||||
} else {
|
||||
$order->update($order_data);
|
||||
}
|
||||
|
||||
/*
|
||||
var_dump($order);
|
||||
var_dump($owner);
|
||||
var_dump($billingaddress);
|
||||
exit;*/
|
||||
|
||||
|
||||
if(!$owner || !$billingaddress) {
|
||||
$this->layout()->setFlash("Fehler beim Speichern", "error");
|
||||
$this->layout()->set("order", $order);
|
||||
return $this->add();
|
||||
}
|
||||
|
||||
$new_id = $order->save();
|
||||
if(!$new_id) {
|
||||
$this->layout()->setFlash("Fehler beim Speichern", "error");
|
||||
$this->layout()->set("order", $order);
|
||||
return $this->add();
|
||||
}
|
||||
|
||||
// save owner and billingaddress if new
|
||||
if($r->owner_id == "new") {
|
||||
$owner_id = $owner->save();
|
||||
if(!$owner_id) {
|
||||
$this->layout()->setFlash("Fehler beim Speichern des Inhabers", "error");
|
||||
$this->redirect("Order", "edit", ['id' => $new_id]);
|
||||
}
|
||||
$order->owner_id = $owner_id;
|
||||
$order->save();
|
||||
}
|
||||
if($r->billingaddress_id == "new") {
|
||||
$billingaddress_id = $billingaddress->save();
|
||||
if(!$billingaddress_id) {
|
||||
$this->layout()->setFlash("Fehler beim Speichern des Rechnungsempfängers", "error");
|
||||
$this->redirect("Order", "edit", ['id' => $new_id]);
|
||||
}
|
||||
$owner->billingaddress_id = $billingaddress_id;
|
||||
$order->save();
|
||||
}
|
||||
|
||||
//var_dump($r->products);exit;
|
||||
// validate and add products
|
||||
if(is_array($r->products) && count($r->products)) {
|
||||
foreach($r->products as $product_id => $p) {
|
||||
//var_dump($p);
|
||||
if(!$product_id || !$p["product_id"]) {
|
||||
continue;
|
||||
}
|
||||
$product_data = [];
|
||||
$product_data["order_id"] = $new_id;
|
||||
$product_data["product_id"] = $p["product_id"];
|
||||
$product_data['amount'] = (!empty($p['amount'])) ? $p['amount'] : 1;
|
||||
$product_data["pos"] = ($p["pos"]) ? $p['pos'] : $order->getNewPos();
|
||||
$product_data["description"] = $p["description"];
|
||||
$product_data["price"] = Layout::commaToDot($p["price"]);
|
||||
$product_data["price_setup"] = Layout::commaToDot($p["price_setup"]);
|
||||
$product_data["billing_delay"] = 0;
|
||||
$product_data["billing_period"] = $p["billing_period"];
|
||||
|
||||
if($product_id == "new") {
|
||||
$product = OrderProductModel::create($product_data);
|
||||
} else {
|
||||
$product = new OrderProduct($product_id);
|
||||
$product->update($product_data);
|
||||
}
|
||||
|
||||
if(!$product->save()) {
|
||||
$this->log->warn("Unable to save OrderProduct:".print_r($product, true));
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
//var_dump($_FILES['OrderFileUpload']);exit;
|
||||
// handle file upload
|
||||
if(array_key_exists("OrderFileUpload", $_FILES) && !$_FILES['OrderFileUpload']['error']) {
|
||||
//var_dump($_FILES);exit;
|
||||
$upload = new mfUpload("OrderFileUpload");
|
||||
$upload->setSavepath(MFUPLOAD_FILE_SAVE_PATH."/documents");
|
||||
$upload->save();
|
||||
|
||||
$file_data = [];
|
||||
$file_data['name'] = ($r->file_name) ? $r->file_name : $upload->getOriginalFilename();
|
||||
$file_data['filename'] = ($r->file_filename) ? $r->file_filename : $upload->getOriginalFilename();
|
||||
$file_data['store_filename'] = $upload->getFilename();
|
||||
$file_data['orig_filename'] = $upload->getOriginalFilename();
|
||||
|
||||
$file = FileModel::create($file_data);
|
||||
$file_id = $file->save();
|
||||
if(!$file_id) {
|
||||
$this->layout()->setFlash("Dateiupload fehlgeschlagen", "warn");
|
||||
unlink($upload->getSavepath()."/".$upload->getFilename());
|
||||
} else {
|
||||
$of = [];
|
||||
$of['order_id'] = $new_id;
|
||||
$of['file_id'] = $file_id;
|
||||
$of['name'] = $file->name;
|
||||
$of['description'] = $file->description;
|
||||
|
||||
$orderfile = OrderFileModel::create($of);
|
||||
if(!$orderfile->save()) {
|
||||
$file->delete();
|
||||
unlink($upload->getSavepath()."/".$upload->getFilename());
|
||||
$this->layout()->setFlash("Dateiupload fehlgeschlagen", "warn");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
$this->layout()->setFlash("Bestellung erfolgreich gespeichert.", "success");
|
||||
$this->redirect("Order", "edit", ["id" => $new_id]);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -62,7 +62,7 @@ class OrderModel {
|
||||
|
||||
$db = FronkDB::singleton();
|
||||
|
||||
$res = $db->select("Order", "*", "1=1 ORDER BY name, filename");
|
||||
$res = $db->select("Order", "*", "1=1 ORDER BY order_date, owner_id");
|
||||
if($db->num_rows($res)) {
|
||||
while($data = $db->fetch_object($res)) {
|
||||
$items[] = new Order($data);
|
||||
@@ -76,7 +76,7 @@ class OrderModel {
|
||||
$db = FronkDB::singleton();
|
||||
|
||||
$where = self::getSqlFilter($filter);
|
||||
$res = $db->select("Order", "*", "$where ORDER BY name, filename");
|
||||
$res = $db->select("Order", "*", "$where ORDER BY order_date, owner_id");
|
||||
if($db->num_rows($res)) {
|
||||
$data = $db->fetch_object($res);
|
||||
$item = new Order($data);
|
||||
|
||||
@@ -1,5 +1,37 @@
|
||||
<?php
|
||||
|
||||
class OrderFile extends mfBaseModel {
|
||||
private $file;
|
||||
|
||||
public function getProperty($name) {
|
||||
if($this->$name == null) {
|
||||
|
||||
if(!$this->id) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if($name == "creator") {
|
||||
$this->creator = new User($this->create_by);
|
||||
return $this->creator;
|
||||
}
|
||||
|
||||
if($name == "editor") {
|
||||
$this->editor = new User($this->edit_by);
|
||||
return $this->editor;
|
||||
}
|
||||
|
||||
$classname = ucfirst($name);
|
||||
$idfield = $name."_id";
|
||||
$this->$name = new $classname($this->$idfield);
|
||||
|
||||
if($this->$name->id) {
|
||||
return $this->$name;
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
return $this->$name;
|
||||
}
|
||||
|
||||
}
|
||||
36
application/OrderFile/OrderFileController.php
Normal file
36
application/OrderFile/OrderFileController.php
Normal file
@@ -0,0 +1,36 @@
|
||||
<?php
|
||||
|
||||
class OrderFileController extends mfBaseController {
|
||||
|
||||
protected function init() {
|
||||
$this->needlogin=true;
|
||||
$me = new User();
|
||||
$me->loadMe();
|
||||
$this->me = $me;
|
||||
$this->layout()->set("me",$me);
|
||||
|
||||
if(!$me->isAdmin()) {
|
||||
$this->redirect("Dashboard");
|
||||
}
|
||||
}
|
||||
|
||||
protected function editAction() {
|
||||
// internal redirect to File::editAction
|
||||
}
|
||||
|
||||
protected function deleteAction() {
|
||||
$id = $this->request->id;
|
||||
|
||||
$orderfile = new OrderFile($id);
|
||||
if(!$orderfile->id || $orderfile->id != $id) {
|
||||
$this->layout()->setFlash("Dokument nicht gefunden.", "error");
|
||||
$this->redirect("Order");
|
||||
}
|
||||
|
||||
$order_id = $orderfile->order_id;
|
||||
|
||||
$orderfile->file->delete();
|
||||
$orderfile->delete();
|
||||
$this->redirect("Order", "edit", ["id" => $order_id]);
|
||||
}
|
||||
}
|
||||
@@ -1,11 +1,10 @@
|
||||
<?php
|
||||
|
||||
class OrderFileModel {
|
||||
public $order_id;
|
||||
public $file_id;
|
||||
public $name;
|
||||
public $description;
|
||||
public $filename;
|
||||
public $orig_filename;
|
||||
public $subfolder;
|
||||
|
||||
public $create_by = null;
|
||||
public $edit_by = null;
|
||||
@@ -89,8 +88,8 @@ class OrderFileModel {
|
||||
$where = self::getSqlFilter($filter);
|
||||
|
||||
$sql = "SELECT OrderFile.* FROM OrderFile
|
||||
LEFT JOIN File ON (Order.file_id = File.id)
|
||||
$where
|
||||
LEFT JOIN File ON (OrderFile.file_id = File.id)
|
||||
WHERE $where
|
||||
ORDER BY order_id, name";
|
||||
|
||||
$res = $db->query($sql);
|
||||
|
||||
67
application/OrderProduct/OrderProduct.php
Normal file
67
application/OrderProduct/OrderProduct.php
Normal file
@@ -0,0 +1,67 @@
|
||||
<?php
|
||||
|
||||
class OrderProduct extends mfBaseModel {
|
||||
private $order;
|
||||
private $product;
|
||||
private $editor;
|
||||
private $creator;
|
||||
|
||||
public function formatAmount() {
|
||||
if(!$this->id) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
$m = [];
|
||||
if(preg_match('/^(\d*)\.(\d+)$/', $this->amount, $m)) {
|
||||
$int = $m[1];
|
||||
$dec = $m[2];
|
||||
|
||||
if(!$dec) {
|
||||
return $int;
|
||||
}
|
||||
|
||||
if(preg_match('/^0+$/', $dec)) {
|
||||
return $int;
|
||||
}
|
||||
|
||||
$dec = preg_replace('/0+$/', "", $dec);
|
||||
return "$int.$dec";
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
public function getProperty($name) {
|
||||
if($this->$name == null) {
|
||||
|
||||
if($name == "creator") {
|
||||
if($this->id) {
|
||||
$this->creator = new User($this->create_by);
|
||||
return $this->creator;
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
if($name == "editor") {
|
||||
if($this->id) {
|
||||
$this->editor = new User($this->edit_by);
|
||||
return $this->editor;
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
$classname = ucfirst($name);
|
||||
$idfield = $name."_id";
|
||||
$this->$name = new $classname($this->$idfield);
|
||||
|
||||
if($this->$name->id) {
|
||||
return $this->$name;
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
return $this->$name;
|
||||
}
|
||||
}
|
||||
130
application/OrderProduct/OrderProductModel.php
Normal file
130
application/OrderProduct/OrderProductModel.php
Normal file
@@ -0,0 +1,130 @@
|
||||
<?php
|
||||
|
||||
class OrderProductModel {
|
||||
public $order_id;
|
||||
public $product_id;
|
||||
public $amount;
|
||||
public $pos;
|
||||
public $description;
|
||||
public $price;
|
||||
public $price_setup;
|
||||
public $billing_delay;
|
||||
public $billing_period;
|
||||
public $note;
|
||||
|
||||
public $create_by = null;
|
||||
public $edit_by = null;
|
||||
public $create = null;
|
||||
public $edit = null;
|
||||
|
||||
|
||||
public static function create(Array $data) {
|
||||
$model = new OrderProduct();
|
||||
|
||||
foreach($data as $field => $value) {
|
||||
if(property_exists(get_called_class(), $field)) {
|
||||
$model->$field = $value;
|
||||
}
|
||||
}
|
||||
|
||||
if(!array_key_exists("note", $data)) {
|
||||
$model->note = "";
|
||||
}
|
||||
|
||||
$me = new User();
|
||||
$me->loadMe();
|
||||
|
||||
if($model->create_by === null) {
|
||||
$model->create_by = $me->id;
|
||||
}
|
||||
if($model->edit_by === null) {
|
||||
$model->edit_by = $me->id;
|
||||
}
|
||||
|
||||
return $model;
|
||||
}
|
||||
|
||||
public static function getOne($id) {
|
||||
if(!is_numeric($id) || !$id) {
|
||||
throw new Exception("Invalid number", 400);
|
||||
}
|
||||
$item = [];
|
||||
$db = FronkDB::singleton();
|
||||
|
||||
$res = $db->select("OrderProduct", "*", "id=$id LIMIT 1");
|
||||
if($db->num_rows($res)) {
|
||||
$data = $db->fetch_object($res);
|
||||
$item = new OrderProduct($data);
|
||||
}
|
||||
return $item;
|
||||
}
|
||||
|
||||
public static function getAll() {
|
||||
$items = [];
|
||||
|
||||
$db = FronkDB::singleton();
|
||||
|
||||
$res = $db->select("OrderProduct", "*", "1=1 ORDER BY order_id, pos, product_id, description");
|
||||
if($db->num_rows($res)) {
|
||||
while($data = $db->fetch_object($res)) {
|
||||
$items[] = new OrderProduct($data);
|
||||
}
|
||||
}
|
||||
return $items;
|
||||
|
||||
}
|
||||
|
||||
public static function getFirst() {
|
||||
$db = FronkDB::singleton();
|
||||
|
||||
$where = self::getSqlFilter($filter);
|
||||
$res = $db->select("OrderProduct", "*", "$where ORDER BY order_id, pos, product_id, description");
|
||||
if($db->num_rows($res)) {
|
||||
$data = $db->fetch_object($res);
|
||||
$item = new OrderProduct($data);
|
||||
if($item->id) {
|
||||
return $item;
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public static function search($filter) {
|
||||
$items = [];
|
||||
$db = FronkDB::singleton();
|
||||
|
||||
$where = self::getSqlFilter($filter);
|
||||
$res = $db->select("OrderProduct", "*", "$where ORDER BY order_id, pos, product_id, description");
|
||||
if($db->num_rows($res)) {
|
||||
while($data = $db->fetch_object($res)) {
|
||||
$items[] = new OrderProduct($data);
|
||||
}
|
||||
}
|
||||
return $items;
|
||||
}
|
||||
|
||||
private function getSqlFilter($filter) {
|
||||
$where = "1=1 ";
|
||||
|
||||
//var_dump($filter);exit;
|
||||
if(array_key_exists("order_id", $filter)) {
|
||||
$order_id = $filter['order_id'];
|
||||
if(is_numeric($order_id)) {
|
||||
$where .= " AND order_id=$order_id";
|
||||
}
|
||||
}
|
||||
|
||||
if(array_key_exists("product_id", $filter)) {
|
||||
$product_id = $filter['product_id'];
|
||||
if(is_numeric($product_id)) {
|
||||
$where .= " AND order_id=$product_id";
|
||||
}
|
||||
}
|
||||
|
||||
//var_dump($filter, $where);exit;
|
||||
return $where;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -165,7 +165,7 @@ class ProductController extends mfBaseController {
|
||||
$this->redirect("Product", "Edit", ['id' => $new_id]);
|
||||
}
|
||||
|
||||
protected function delete() {
|
||||
protected function deleteAction() {
|
||||
$id = $this->request->id;
|
||||
|
||||
$product = new Product($id);
|
||||
@@ -178,4 +178,44 @@ class ProductController extends mfBaseController {
|
||||
$product->delete();
|
||||
$this->redirect("Product");
|
||||
}
|
||||
|
||||
protected function apiAction() {
|
||||
$do = $this->request->do;
|
||||
$data = [];
|
||||
|
||||
switch($do) {
|
||||
case "getProduct":
|
||||
$return = $this->getProductApi();
|
||||
break;
|
||||
default:
|
||||
$return = false;
|
||||
}
|
||||
|
||||
if(!is_array($return) || !count($return)) {
|
||||
$data = ["status" => "error"];
|
||||
$this->returnJson($data);
|
||||
}
|
||||
$data['status'] = "OK";
|
||||
$data['result'] = $return;
|
||||
$this->returnJson($data);
|
||||
}
|
||||
|
||||
private function getProductApi() {
|
||||
$product_id = $this->request->product_id;
|
||||
if(!is_numeric($product_id) || $product_id < 1) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$form_id = false;
|
||||
if($this->request->form_id) {
|
||||
$form_id = $this->request->form_id;
|
||||
}
|
||||
|
||||
$product = new Product($product_id);
|
||||
if(!$product->id) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return ["product" => $product->data, "form_id" => $form_id];
|
||||
}
|
||||
}
|
||||
@@ -45,7 +45,7 @@ class mfUpload {
|
||||
}
|
||||
}
|
||||
|
||||
public function getSavepath($path) {
|
||||
public function getSavepath() {
|
||||
return $this->savepath;
|
||||
}
|
||||
|
||||
|
||||
@@ -32,4 +32,18 @@
|
||||
td.controls {
|
||||
cursor: default;
|
||||
text-align: left; letter-spacing: 4px; font-size: 1.1em;
|
||||
}
|
||||
|
||||
.product-container {
|
||||
padding-top: 4px;
|
||||
padding-bottom: 4px;
|
||||
border-top: 2px solid #dee2e6;
|
||||
}
|
||||
|
||||
.product-container:last-child {
|
||||
border-bottom: 2px solid #dee2e6;
|
||||
}
|
||||
|
||||
.product-container:nth-child(even) {
|
||||
background-color: #f1f5f7;
|
||||
}
|
||||
Reference in New Issue
Block a user