more bug fix
This commit is contained in:
parent
5a1348a800
commit
61ff2d4ca7
|
|
@ -104,6 +104,7 @@ class PrintersController extends AbstractController
|
||||||
$temp['fastsell']['cashdeskTicket'] = $settings->isFastsellCashdeskTicket();
|
$temp['fastsell']['cashdeskTicket'] = $settings->isFastsellCashdeskTicket();
|
||||||
$temp['fastsell']['invoice'] = $settings->isFastsellInvoice();
|
$temp['fastsell']['invoice'] = $settings->isFastsellInvoice();
|
||||||
$temp['fastsell']['pdf'] = $settings->isFastsellPdf();
|
$temp['fastsell']['pdf'] = $settings->isFastsellPdf();
|
||||||
|
$temp['fastsell']['pos'] = $settings->isFastsellPos();
|
||||||
|
|
||||||
$temp['repservice']['noteString'] = $settings->getRepserviceNoteString();
|
$temp['repservice']['noteString'] = $settings->getRepserviceNoteString();
|
||||||
$temp['repservice']['paper'] = $settings->getRepServicePaper();
|
$temp['repservice']['paper'] = $settings->getRepServicePaper();
|
||||||
|
|
@ -225,6 +226,7 @@ class PrintersController extends AbstractController
|
||||||
$settings->setFastsellCashdeskTicket($params['fastsell']['cashdeskTicket'] ?? false);
|
$settings->setFastsellCashdeskTicket($params['fastsell']['cashdeskTicket'] ?? false);
|
||||||
$settings->setFastsellInvoice($params['fastsell']['invoice'] ?? false);
|
$settings->setFastsellInvoice($params['fastsell']['invoice'] ?? false);
|
||||||
$settings->setFastsellPdf($params['fastsell']['pdf'] ?? false);
|
$settings->setFastsellPdf($params['fastsell']['pdf'] ?? false);
|
||||||
|
$settings->setFastsellPos($params['fastsell']['pos'] ?? false);
|
||||||
|
|
||||||
$settings->setLeftFooter($params['global']['leftFooter']);
|
$settings->setLeftFooter($params['global']['leftFooter']);
|
||||||
$settings->setRightFooter($params['global']['rightFooter']);
|
$settings->setRightFooter($params['global']['rightFooter']);
|
||||||
|
|
|
||||||
|
|
@ -120,6 +120,9 @@ class PrintOptions
|
||||||
#[ORM\Column(nullable: true)]
|
#[ORM\Column(nullable: true)]
|
||||||
private ?bool $fastsellCashdeskTicket = null;
|
private ?bool $fastsellCashdeskTicket = null;
|
||||||
|
|
||||||
|
#[ORM\Column(nullable: true)]
|
||||||
|
private ?bool $fastsellPos = null;
|
||||||
|
|
||||||
#[ORM\Column(type: Types::TEXT, nullable: true)]
|
#[ORM\Column(type: Types::TEXT, nullable: true)]
|
||||||
private ?string $leftFooter = null;
|
private ?string $leftFooter = null;
|
||||||
|
|
||||||
|
|
@ -573,6 +576,18 @@ class PrintOptions
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function isFastsellPos(): ?bool
|
||||||
|
{
|
||||||
|
return $this->fastsellPos;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setFastsellPos(?bool $fastsellPos): static
|
||||||
|
{
|
||||||
|
$this->fastsellPos = $fastsellPos;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
public function getLeftFooter(): ?string
|
public function getLeftFooter(): ?string
|
||||||
{
|
{
|
||||||
return $this->leftFooter;
|
return $this->leftFooter;
|
||||||
|
|
|
||||||
|
|
@ -178,7 +178,7 @@
|
||||||
<footer style="text-align:center">
|
<footer style="text-align:center">
|
||||||
<p>{{ bid.address }}</p>
|
<p>{{ bid.address }}</p>
|
||||||
<p>{{ bid.tel }}</p>
|
<p>{{ bid.tel }}</p>
|
||||||
<p>hesabix.ir</p>
|
|
||||||
</footer>
|
</footer>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -174,7 +174,7 @@
|
||||||
<footer style="text-align:center">
|
<footer style="text-align:center">
|
||||||
<p>{{ bid.address }}</p>
|
<p>{{ bid.address }}</p>
|
||||||
<p>{{ bid.tel }}</p>
|
<p>{{ bid.tel }}</p>
|
||||||
<p>hesabix.ir</p>
|
|
||||||
</footer>
|
</footer>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
|
||||||
|
|
@ -174,7 +174,7 @@
|
||||||
<footer style="text-align:center">
|
<footer style="text-align:center">
|
||||||
<p>{{ bid.address }}</p>
|
<p>{{ bid.address }}</p>
|
||||||
<p>{{ bid.tel }}</p>
|
<p>{{ bid.tel }}</p>
|
||||||
<p>hesabix.ir</p>
|
|
||||||
</footer>
|
</footer>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
|
||||||
|
|
@ -174,7 +174,7 @@
|
||||||
<footer style="text-align:center">
|
<footer style="text-align:center">
|
||||||
<p>{{ bid.address }}</p>
|
<p>{{ bid.address }}</p>
|
||||||
<p>{{ bid.tel }}</p>
|
<p>{{ bid.tel }}</p>
|
||||||
<p>hesabix.ir</p>
|
|
||||||
</footer>
|
</footer>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
|
||||||
|
|
@ -216,7 +216,7 @@
|
||||||
<footer style="text-align:center">
|
<footer style="text-align:center">
|
||||||
<p>{{ bid.address }}</p>
|
<p>{{ bid.address }}</p>
|
||||||
<p>{{ bid.tel }}</p>
|
<p>{{ bid.tel }}</p>
|
||||||
<p>hesabix.ir</p>
|
|
||||||
</footer>
|
</footer>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
|
||||||
|
|
@ -178,7 +178,7 @@
|
||||||
<footer style="text-align:center">
|
<footer style="text-align:center">
|
||||||
<p>{{ bid.address }}</p>
|
<p>{{ bid.address }}</p>
|
||||||
<p>{{ bid.tel }}</p>
|
<p>{{ bid.tel }}</p>
|
||||||
<p>hesabix.ir</p>
|
|
||||||
</footer>
|
</footer>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -178,7 +178,7 @@
|
||||||
<footer style="text-align:center">
|
<footer style="text-align:center">
|
||||||
<p>{{ bid.address }}</p>
|
<p>{{ bid.address }}</p>
|
||||||
<p>{{ bid.tel }}</p>
|
<p>{{ bid.tel }}</p>
|
||||||
<p>hesabix.ir</p>
|
|
||||||
</footer>
|
</footer>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -179,7 +179,7 @@
|
||||||
<footer style="text-align:center">
|
<footer style="text-align:center">
|
||||||
<p>{{ bid.address }}</p>
|
<p>{{ bid.address }}</p>
|
||||||
<p>{{ bid.tel }}</p>
|
<p>{{ bid.tel }}</p>
|
||||||
<p>hesabix.ir</p>
|
|
||||||
</footer>
|
</footer>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -208,6 +208,13 @@ export default defineComponent({
|
||||||
axios.post("/api/printers/options/info").then((response) => {
|
axios.post("/api/printers/options/info").then((response) => {
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
this.printOptions = response.data.sell;
|
this.printOptions = response.data.sell;
|
||||||
|
// مقداردهی پیشفرض سوییچها از تنظیمات فاکتور سریع
|
||||||
|
if (response.data.fastsell) {
|
||||||
|
this.canPrint = !!response.data.fastsell.invoice;
|
||||||
|
this.canPrintCashdeskRecp = !!response.data.fastsell.cashdeskTicket;
|
||||||
|
this.canPdf = !!response.data.fastsell.pdf;
|
||||||
|
this.canPos = !!response.data.fastsell.pos;
|
||||||
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
save() {
|
save() {
|
||||||
|
|
@ -268,7 +275,7 @@ export default defineComponent({
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
if (response.data.result == '1') {
|
if (response.data.result == '1') {
|
||||||
this.update = response.data.doc.code;
|
this.update = response.data.doc.code;
|
||||||
if (this.canPrint || this.canPrintCashdeskRecp) {
|
if (this.canPrint || this.canPrintCashdeskRecp || this.canPos) {
|
||||||
axios.post('/api/sell/print/invoice', {
|
axios.post('/api/sell/print/invoice', {
|
||||||
code: this.update,
|
code: this.update,
|
||||||
pdf: this.canPdf,
|
pdf: this.canPdf,
|
||||||
|
|
|
||||||
|
|
@ -272,6 +272,9 @@
|
||||||
<v-col cols="12" sm="6" md="4" lg="3">
|
<v-col cols="12" sm="6" md="4" lg="3">
|
||||||
<v-switch v-model="settings.fastsell.cashdeskTicket" :label="$t('dialog.cashdeskTicket')" color="primary" hide-details density="compact"></v-switch>
|
<v-switch v-model="settings.fastsell.cashdeskTicket" :label="$t('dialog.cashdeskTicket')" color="primary" hide-details density="compact"></v-switch>
|
||||||
</v-col>
|
</v-col>
|
||||||
|
<v-col cols="12" sm="6" md="4" lg="3">
|
||||||
|
<v-switch v-model="settings.fastsell.pos" label="صورت حساب POS" color="primary" hide-details density="compact"></v-switch>
|
||||||
|
</v-col>
|
||||||
<v-col cols="12" sm="6" md="4" lg="3">
|
<v-col cols="12" sm="6" md="4" lg="3">
|
||||||
<v-switch v-model="settings.fastsell.pdf" :label="$t('dialog.export_pdf')" color="primary" hide-details density="compact"></v-switch>
|
<v-switch v-model="settings.fastsell.pdf" :label="$t('dialog.export_pdf')" color="primary" hide-details density="compact"></v-switch>
|
||||||
</v-col>
|
</v-col>
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue