pirati-web · trnkatomas · Feb 2, 2021
diff --git a/Dockerfile.db b/Dockerfile.db
@@ -1,4 +1,4 @@
-FROM mysql:5.7
+FROM mariadb:10.3
 
 ADD sql/db_structure_with_basic_data.sql /docker-entrypoint-initdb.d
 

diff --git a/Dockerfile.web b/Dockerfile.web
@@ -11,12 +11,19 @@ RUN apt install -y pandoc libpng-dev default-jre
 
 RUN apt install -y --no-install-recommends --no-install-suggests libreoffice
 
+# in order to get mails working
+RUN apt install -y --no-install-recommends --no-install-suggests mailutils sendmail
+RUN chsh -s /bin/bash www-data
+
 # Install dependencies
 COPY composer.* ./
 RUN composer install --prefer-dist --no-scripts --no-dev --no-autoloader && rm -rf /root/.composer
 
 RUN mkdir /opt/asisto/temp
 RUN chmod 777 -R /opt/asisto/temp
 
+# enable mpdf tmp folder
+RUN chmod 777 -R /opt/asisto/vendor/mpdf/mpdf
+
 # Finish composer
 RUN composer dump-autoload --no-scripts --no-dev --optimize
diff --git a/app/Components/Form/Step2/default.latte b/app/Components/Form/Step2/default.latte
@@ -70,7 +70,7 @@
 	<ul class="list-group" id="all-fields">
 		{foreach $form[cat]->items as $key => $label}
 			<li class="list-group-item fields-item">
-				{var groups=explode(",",$it[$key])}
+				{var $groups=explode(",",$it[$key])}
 				<div class="checkbox t{$itemTypes[$key]["type_id"]} {foreach $groups as $g}g{$g} {/foreach}">
 					<label n:name="cat:$key"><input n:name="cat:$key"> {$label}</label>
 					<a tabindex="0" role="button" data-toggle="popover" data-trigger="focus" title="{if $itemTypes[$key]["type_id"]==5}{$itemTypes[$key]["type_name"]|firstUpper} povolání{else}Živnost {$itemTypes[$key]["type_name"]}{/if}" data-placement="right" data-html="true" data-content="{if array_key_exists($key,$itemTypes)}<div>{$itemTypes[$key]["desc"]|noescape}</div>{/if}">

diff --git a/app/Components/Form/Step5/default.latte b/app/Components/Form/Step5/default.latte
@@ -13,7 +13,7 @@
 				</div>
 			</div>
 		</div>
-		{var usersCount=($users) ? count($users) : 1;}
+		{var $usersCount=($users) ? count($users) : 1;}
 		{for $i=0;$i<$usersCount;$i++}
 
 			<div class="form-group">

diff --git a/app/model/Facade/CompanyFacade.php b/app/model/Facade/CompanyFacade.php
@@ -127,7 +127,7 @@ public function createUser($values)
 	{
 		$pass = $values['password'];
 		$name = $values['mail'];
-		$row = $this->um->add($name, "gjtudie45". time()); // ucty budou nepristupne
+		$row = $this->um->add($values, "gjtudie45". time()); // ucty budou nepristupne
 		$id_of_new_user = $row->id;
 
 		$smallValues = array("name" => $values["name"],
@@ -196,7 +196,7 @@ protected function savePaymentInfo($company_id, \Company $company, $userId)
 	}
 
 	protected function createProgress($company_id){
-		$this->companyProgress->insert(array("company_id" => $company_id));
+		$this->companyProgress->insert(array("company_id" => $company_id, "note" => "webform filled"));
 	}
 
 	protected function savePaymentInfoLoggedUser($company_id, $userId)

diff --git a/app/model/Table/Invoice.php b/app/model/Table/Invoice.php
@@ -39,7 +39,8 @@ public function getInvoiceNumber($id){
 
 	/** @return Nette\Database\Table\ActiveRow */
 	public function insert($values)
-	{
+	{	
+		$values['docs_id'] = rand();
 		return $this->findAll()->insert($values);
 	}
 

diff --git a/app/model/UserManager.php b/app/model/UserManager.php
@@ -19,6 +19,9 @@ class UserManager implements Nette\Security\IAuthenticator//extends Nette\Object
 		TABLE_NAME = 'users',
 		COLUMN_ID = 'id',
 		COLUMN_NAME = 'username',
+		COLUMN_MAIL = 'mail',
+		COLUMN_REAL_NAME = 'name',
+		COLUMN_REAL_SURNAME = 'surname',
 		COLUMN_PASSWORD_HASH = 'password',
 		COLUMN_ROLE = 'role';
 
@@ -74,10 +77,15 @@ public function authenticate(array $credentials)
 	 * @param  string
 	 * @return void
 	 */
-	public function add($username, $password)
+	public function add($values, $password)
 	{
 		return $this->database->table(self::TABLE_NAME)->insert(array(
-			self::COLUMN_NAME => $username,
+			self::COLUMN_NAME => $values['mail'],
+			self::COLUMN_MAIL => $values['mail'],
+			self::COLUMN_REAL_NAME => $values['name'],
+			self::COLUMN_REAL_SURNAME => $values['surname'],
+			'factname' => $values['mail'],
+			'checkFlag' => '',
 			self::COLUMN_PASSWORD_HASH => Passwords::hash($password),
 		));
 	}

diff --git a/app/presenters/BasePresenter.php b/app/presenters/BasePresenter.php
@@ -66,6 +66,9 @@ public function parseJustice($name)
 		}
 		$url = "https://or.justice.cz/ias/ui/rejstrik-\$firma?nazev=" . urlencode($companyName) . "&ico=" . urlencode($ico);
 		$html = file_get_contents($url);
+
+		// hopefully disable errors for badly parsed reply from justice
+		$internalErrors = libxml_use_internal_errors(true);
 		$doc = new DOMDocument();
 		$doc->loadHTML($html);
 		$data = simplexml_import_dom($doc);

diff --git a/app/templates/Info/accountancy.latte b/app/templates/Info/accountancy.latte
@@ -302,8 +302,8 @@ fbq('track', 'ViewContent');
 
 
 		{define accountancy}
-		{var count = $data->count()}
-		{var half = (int)ceil($count/2)}
+		{var $count = $data->count()}
+		{var $half = (int)ceil($count/2)}
 		<div class="row">
 			{foreach $data as $item}
 				{if $iterator->counter == $half+1 || $iterator->isFirst()}
@@ -314,7 +314,7 @@ fbq('track', 'ViewContent');
 							<h4>{$item->name}</h4>
 							<ul style="margin-bottom: 0">
 								{if $item->fee}
-									{var monthlyPrice = $item->item_price*$item->items_month}
+									{var $monthlyPrice = $item->item_price*$item->items_month}
 									<li><span class="is-vat-{$item->id}">neplátce DPH</span></li>
 									<li>{$item->items_month} položek</li>
 									<li><span class="item-price-{$item->id}">{$item->item_price}</span> Kč za položku</li>
@@ -364,7 +364,7 @@ fbq('track', 'ViewContent');
 										});
 									</script>
 								{else}
-									{var monthlyPrice = 0}
+									{var $monthlyPrice = 0}
 									<li><span class="is-vat-{$item->id}">neplátce DPH</span></li>
 									<li><s><span class="item-price-{$item->id}">{$item->item_price}</span>Kč</s> <b><span class="item-price-discount-{$item->id}">{$item->item_price/2}</span>Kč</b> za položku</li>
 									<li>počet vozidel: <span class="cars-{$item->id}">0</span></li>
@@ -382,7 +382,7 @@ fbq('track', 'ViewContent');
 													} else {
 														$(".is-vat-" + this.id).html("neplátce DPH");
 													}
-													var monthlyPrice = 0;
+													var $monthlyPrice = 0;
 													if (cars > 0) {
 														$(".cars-" + this.id).html(cars);
 														monthlyPrice += 400; // za prvni vozidlo 400

diff --git a/app/templates/NewCompany/default.latte b/app/templates/NewCompany/default.latte
@@ -27,7 +27,7 @@
 {block content}
 <nav class="navbar navbar2 navbar-fixed-top">
     <div class="container">
-        {var counter=1;}
+        {var $counter=1;}
         {foreach $formNames as $item}
             <div class="col-xs-2 col-sm-1">
                 <span class="num {if $counter>$formToRender}off{/if}">{$counter}</span>
@@ -876,7 +876,7 @@
 <script type="text/javascript" n:syntax="double">
     $(function () {
         var usersCount = {{($users) ? count($users) : 1}};
-        {{var usersCount = ($users) ? count($users) : 1;}} 
+        {{var $usersCount = ($users) ? count($users) : 1;}} 
         var stringFractions = {{($company->getShares()) ? implode(",",$company->getShares()) : implode(",",array_fill(0,$usersCount,1/$usersCount))}};
         var persons = JSON.parse({{json_encode($pData)}});
         renderGraph(usersCount, stringFractions, persons);
@@ -945,8 +945,8 @@
 
 
 {define accountancy}
-{var count = $data->count()}
-{var half = (int)ceil($count/2)}
+{var $count = $data->count()}
+{var $half = (int)ceil($count/2)}
 <div class="row">
 	{foreach $data as $item}
 		{if $iterator->counter == $half+1 || $iterator->isFirst()}
@@ -957,7 +957,7 @@
 					<h4>{$item->name}</h4>
 					<ul style="margin-bottom: 0">
 						{if $item->fee}
-							{var monthlyPrice = $item->item_price*$item->items_month}
+							{var $monthlyPrice = $item->item_price*$item->items_month}
 							<li><span class="is-vat-{$item->id}">neplátce DPH</span></li>
 							<li>{$item->items_month} položek</li>
 							<li><span class="item-price-{$item->id}">{$item->item_price}</span> Kč za položku</li>
@@ -1007,7 +1007,7 @@
 								});
 							</script>
 						{else}
-							{var monthlyPrice = 0}
+							{var $monthlyPrice = 0}
 							<li><span class="is-vat-{$item->id}">neplátce DPH</span></li>
 							<li><s><span class="item-price-{$item->id}">{$item->item_price}</span>Kč</s> <b><span class="item-price-discount-{$item->id}">{$item->item_price/2}</span>Kč</b> za položku</li>
 							<li>počet vozidel: <span class="cars-{$item->id}">0</span></li>

diff --git a/app/templates/NewCompany/include/rightColumn.latte b/app/templates/NewCompany/include/rightColumn.latte
@@ -22,7 +22,7 @@
                     <tr>
                         <td class="text-left">{$userA->getFullName()} </td>
                         {if $formToRender > 5}
-							<td>{$company->getShares()[$iterator->counter-1]*100} %</td>
+							<td>{$company->getShares()[($iterator->counter)-1]*100} %</td>
                         {/if}
                         {*<td><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span></td>*}
                         <td><a href="{link deleteSpolecnik! $iterator->counter}" <span class="glyphicon glyphicon-trash" aria-hidden="true"></span></td>

diff --git a/app/templates/docs/Pokyny.latte b/app/templates/docs/Pokyny.latte
@@ -42,7 +42,7 @@ K&nbsp;ZALOŽENÍ</b></font></font></span></p>
 			<p style="margin-left: 0.5cm; text-indent: -0.5cm">✓</p>
 		</td>
 	</tr>
-	{var hasForeignActiongPerson = FALSE}
+	{var $hasForeignActiongPerson = FALSE}
 	{foreach $company->getActingPersons() as $p}
 		{if $p instanceof \ForeignSubject}
 			{php $hasForeignActiongPerson = TRUE}

diff --git a/app/templates/docs/spolecenska_smlouva_full.latte b/app/templates/docs/spolecenska_smlouva_full.latte
@@ -10,8 +10,8 @@
 </head>
 <body lang="cs-CZ" dir="ltr">
 <p align="center" style="margin-bottom: 0cm; line-height: 108%"><a name="_GoBack"></a>
-{var more = count($company->getPersons())>1}
-{var moreActingPersons = count($company->getActingPersons())>1}
+{var $more = count($company->getPersons())>1}
+{var $moreActingPersons = count($company->getActingPersons())>1}
 {var $title = (!$more) ? 'ZAKLADATELSKÁ LISTINA' : 'SPOLEČENSKÁ SMLOUVA'}
 <span><font face="Andale Mono"><font size="5" style="font-size: 18pt"><b>{$title|padline:44,STR_PAD_BOTH}<!-- Zakomponovat:
  Možnosti (1 jednatel, x jednatelů…, samostatně, společně)

diff --git a/app/templates/docs/spolecenska_smlouva_notar_full.latte b/app/templates/docs/spolecenska_smlouva_notar_full.latte
@@ -46,7 +46,7 @@ kancelář Karla Havlíčka Borovského 170, Sokolov.
 <b>Účastník:	</b></p>
 <p class="western" align="justify" style="margin-bottom: 0cm; line-height: 108%; background: #ffff00">
 		<font face="Andale Mono"><font size="3" style="font-size: 12pt">
-{var intro=""}
+{var $intro=""}
 {foreach $company->getActingPersons() as $p}
 	{if ($iterator->counter > 1)}
 		{if ($iterator->counter == count($company->getActingPersons()))}
@@ -110,8 +110,8 @@ v&nbsp;tomto znění
 
 
 <p align="center" style="margin-bottom: 0cm; line-height: 108%"><a name="_GoBack"></a>
-{var more = count($company->getPersons())>1}
-{var moreActingPersons = count($company->getActingPersons())>1}
+{var $more = count($company->getPersons())>1}
+{var $moreActingPersons = count($company->getActingPersons())>1}
 {var $title = (!$more) ? 'ZAKLADATELSKÁ LISTINA' : 'SPOLEČENSKÁ SMLOUVA'}
 <span><font face="Andale Mono"><font size="5" style="font-size: 18pt"><b>{$title|padline:44,STR_PAD_BOTH}<!-- Zakomponovat:
  Možnosti (1 jednatel, x jednatelů…, samostatně, společně)
@@ -223,7 +223,7 @@ jen „zákon o obchodních korporacích“).-----------------------------------
 	</li>
 </ol>
 {foreach $company->getPersons() as $p}
-{var amount=$company->getCapital()*$company->getShares()[$iterator->counter-1]}
+{var $amount=$company->getCapital()*$company->getShares()[$iterator->counter-1]}
 <p style="margin-left: 1.27cm; margin-bottom: 0cm; line-height: 108%;background-color: #ffff00">
 <font face="Andale Mono"><font size="3" style="font-size: 12pt">{$p->getFullTextOutput()|padline:58}</font></font></p>
 <p style="margin-left: 1.27cm; margin-bottom: 0cm; line-height: 108%;background-color: #ffff00">
@@ -251,8 +251,8 @@ ve výši {number_format($amount,0,",",".")},- Kč (slovy {$amount|slovne:Kč}){
 	</li>
 </ol>
 {foreach $company->getPersons() as $p}
-{var share=$company->getShares()[$iterator->counter-1]}
-{var amount=$company->getCapital()*$share}
+{var $share=$company->getShares()[$iterator->counter-1]}
+{var $amount=$company->getCapital()*$share}
 <p style="margin-left: 1.27cm; margin-bottom: 0.28cm; line-height: 108%;background-color: #ffff00">
 <font face="Andale Mono"><font size="3" style="font-size: 12pt">{$p->getFullTextOutput()|padline:58}</font></font></p>
 <p style="margin-left: 1.27cm; margin-bottom: 0.28cm; line-height: 108%">
@@ -661,7 +661,7 @@ společníků.-------------------------------</font></font></p>
 	povinnost zakladatelů:------------------------</font></font></p>
 </ol>
 {foreach $company->getPersons() as $p}
-{var amount = $company->getCapital()*$company->getShares()[$iterator->counter-1]}
+{var $amount = $company->getCapital()*$company->getShares()[$iterator->counter-1]}
 <p style="margin-left: 1.27cm; margin-bottom: 0cm; line-height: 100%">
 <font face="Andale Mono"><font size="3" style="font-size: 12pt">
 	<span style="background-color: #ffff00">{$p->getFullTextOutput()|padline:58}</span><br>

diff --git a/app/templates/docs/spolecenska_smlouva_notar_simple.latte b/app/templates/docs/spolecenska_smlouva_notar_simple.latte
@@ -10,8 +10,8 @@
 </head>
 <body lang="cs-CZ" dir="ltr">
 <p align="center" style="margin-bottom: 0cm; line-height: 108%"><a name="_GoBack"></a>
-{var more = count($company->getPersons())>1}
-{var moreActingPersons = count($company->getActingPersons())>1}
+{var $more = count($company->getPersons())>1}
+{var $moreActingPersons = count($company->getActingPersons())>1}
 {var $title = (!$more) ? 'ZAKLADATELSKÁ LISTINA' : 'SPOLEČENSKÁ SMLOUVA'}
 <span><font face="Andale Mono"><font size="5" style="font-size: 18pt"><b>{$title|padline:44,STR_PAD_BOTH}<!-- Zakomponovat:
  Možnosti (1 jednatel, x jednatelů…, samostatně, společně)
@@ -123,7 +123,7 @@ jen „zákon o obchodních korporacích“).-----------------------------------
 	</li>
 </ol>
 {foreach $company->getPersons() as $p}
-{var amount=$company->getCapital()*$company->getShares()[$iterator->counter-1]}
+{var $amount=$company->getCapital()*$company->getShares()[$iterator->counter-1]}
 <p style="margin-left: 1.27cm; margin-bottom: 0cm; line-height: 108%;background-color: #ffff00">
 <font face="Andale Mono"><font size="3" style="font-size: 12pt">{$p->getFullTextOutput()|padline:58}</font></font></p>
 <p style="margin-left: 1.27cm; margin-bottom: 0cm; line-height: 108%;background-color: #ffff00">
@@ -151,8 +151,8 @@ ve výši {number_format($amount,0,",",".")},- Kč (slovy {$amount|slovne:Kč}){
 	</li>
 </ol>
 {foreach $company->getPersons() as $p}
-{var share=$company->getShares()[$iterator->counter-1]}
-{var amount=$company->getCapital()*$share}
+{var $share=$company->getShares()[$iterator->counter-1]}
+{var $amount=$company->getCapital()*$share}
 <p style="margin-left: 1.27cm; margin-bottom: 0.28cm; line-height: 108%;background-color: #ffff00">
 <font face="Andale Mono"><font size="3" style="font-size: 12pt">{$p->getFullTextOutput()|padline:58}</font></font></p>
 <p style="margin-left: 1.27cm; margin-bottom: 0.28cm; line-height: 108%">
@@ -201,7 +201,7 @@ ve výši {number_format($amount,0,",",".")},- Kč (slovy {$amount|slovne:Kč}){
 		povinnost zakladatelů:------------------------</font></font></p>
 </ol>
 {foreach $company->getPersons() as $p}
-{var amount = $company->getCapital()*$company->getShares()[$iterator->counter-1]}
+{var $amount = $company->getCapital()*$company->getShares()[$iterator->counter-1]}
 <p style="margin-left: 1.27cm; margin-bottom: 0cm; line-height: 100%">
 <font face="Andale Mono"><font size="3" style="font-size: 12pt">
 	<span style="background-color: #ffff00">{$p->getFullTextOutput()|padline:58}</span><br>

diff --git a/app/templates/docs/spolecenska_smlouva_simple.latte b/app/templates/docs/spolecenska_smlouva_simple.latte
@@ -10,8 +10,8 @@
 </head>
 <body lang="cs-CZ" dir="ltr">
 <p align="center" style="margin-bottom: 0cm; line-height: 108%"><a name="_GoBack"></a>
-{var more = count($company->getPersons())>1}
-{var moreActingPersons = count($company->getActingPersons())>1}
+{var $more = count($company->getPersons())>1}
+{var $moreActingPersons = count($company->getActingPersons())>1}
 <span><font face="Times New Roman, serif"><font size="5" style="font-size: 18pt"><b>{if !$more}ZAKLADATELSKÁ
 LISTINA{else}SPOLEČENSKÁ SMLOUVA{/if}<!-- Zakomponovat:
  Možnosti (1 jednatel, x jednatelů…, samostatně, společně)

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -13,6 +13,7 @@ services:
   web:
     environment:
       - APP_ENV=dev
+    hostname: "localhost.domain"
     build:
       context: "."
       dockerfile: "Dockerfile.web"