Merge branch 'master' of https://github.com/morrning/hesabixCore
merge to local
This commit is contained in:
commit
571d7bb7bf
|
@ -83,6 +83,8 @@ class PersonsController extends AbstractController
|
|||
$person->setNikename($params['nikename']);
|
||||
if(array_key_exists('name',$params))
|
||||
$person->setName($params['name']);
|
||||
if(array_key_exists('birthday',$params))
|
||||
$person->setBirthday($params['birthday']);
|
||||
if(array_key_exists('tel',$params))
|
||||
$person->setTel($params['tel']);
|
||||
if(array_key_exists('address',$params))
|
||||
|
|
|
@ -107,6 +107,9 @@ class Person
|
|||
#[ORM\OneToMany(mappedBy: 'Person', targetEntity: StoreroomTicket::class)]
|
||||
private Collection $storeroomTickets;
|
||||
|
||||
#[ORM\Column(length: 255, nullable: true)]
|
||||
private ?string $birthday = null;
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
$this->hesabdariRows = new ArrayCollection();
|
||||
|
@ -527,4 +530,16 @@ class Person
|
|||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getBirthday(): ?string
|
||||
{
|
||||
return $this->birthday;
|
||||
}
|
||||
|
||||
public function setBirthday(?string $birthday): static
|
||||
{
|
||||
$this->birthday = $birthday;
|
||||
|
||||
return $this;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -27,6 +27,8 @@
|
|||
<!-- END Stylesheets -->
|
||||
<!--===== Custom Font css =====-->
|
||||
<link href="{{ asset('/assets/css/custom-fonts.css') }}" rel="stylesheet"/>
|
||||
<!-- Place this tag in your head or just before your close body tag. -->
|
||||
<script async defer src="https://buttons.github.io/buttons.js"></script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="page-container">
|
||||
|
@ -244,8 +246,8 @@
|
|||
<script src="https://www.zarinpal.com/webservice/TrustCode" type="text/javascript"></script>
|
||||
</div>
|
||||
<div class="col">
|
||||
<img alt="نماد اعتماد الکترونیکی" src="/img/enamad-logo.png" class="img-thumbnail" style="max-height: 120px;">
|
||||
</div>
|
||||
<!-- Place this tag where you want the button to render. -->
|
||||
<a class="github-button" href="https://github.com/morrning/hesabixUi" data-size="large" aria-label="Star morrning/hesabixUi on GitHub">مخزن کدهای حسابیکس</a> </div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -1,10 +1,16 @@
|
|||
<?php
|
||||
$http_origin = false;
|
||||
if(isset($_SERVER['HTTP_ORIGIN']))
|
||||
$http_origin = $_SERVER['HTTP_ORIGIN'];
|
||||
|
||||
if ($http_origin == "https://app.hesabix.ir" || $http_origin == "http://insider.hesabix.ir")
|
||||
elseif(isset($_SERVER['HTTP_ORIGIN']))
|
||||
$http_origin = $_SERVER['HTTP_REFERER'];
|
||||
if($http_origin){
|
||||
if ($http_origin == "https://app.hesabix.ir" || $http_origin == "http://insider.hesabix.ir" || $http_origin == "http://localhost")
|
||||
{
|
||||
header("Access-Control-Allow-Origin: $http_origin");
|
||||
}
|
||||
}
|
||||
|
||||
header("Access-Control-Allow-Headers: *");
|
||||
header("Access-Control-Allow-Methods: *");
|
||||
header("Allow: GET, POST, OPTIONS, PUT, DELETE");
|
||||
|
|
Loading…
Reference in a new issue