ITsolved/prodejna
2
0
Fork 0
Code Issues 8 Pull Requests Releases Wiki Activity

Added insert date to voucher items and save date to vouchers. Additional voucher descriptions (name, contact...) are now copied from saved vouchers when load items.

Browse Source 
closes #286
This commit is contained in:
pepa
2017-03-21 13:30:42 +01:00
parent d4b5ca681c
commit c6e4e5818a
13 changed files with 101 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shop/shopform.cpp
+12 -2
View File
@@ -39,10 +39,11 @@ void ShopForm::loadLast()
if (m_itemsModel == NULL)
{
m_itemsModel = new AutoTableModel<VoucherItem>(this);
m_itemsModel->setEditableCols(QList<int>() << 1);
m_itemsModel->setEditableCols(QList<int>() << 2);
m_itemsModel->setTranslations(Context::instance().plugin("SHOP")->translations());
ui->actualReceipt->setModel(m_itemsModel);
ui->actualReceipt->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);
ui->actualReceipt->setColumnHidden(0, true);
ui->actualReceipt->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Stretch);
}
ShopService srv;
@@ -140,6 +141,7 @@ void ShopForm::on_saveButton_clicked()
if (form->saveAsNew())
{
m_voucher->setStatus(Voucher::NOT_PAID);
m_voucher->setSaveDateTime(QDateTime::currentDateTime());
srv.updateVoucher(m_voucher);
createEmptyVoucher();
}
@@ -164,6 +166,11 @@ void ShopForm::on_loadButton_clicked()
form->setAttribute(Qt::WA_DeleteOnClose);
connect(form, &QDialog::accepted, [this, form](){
if (form->selectedItems().isEmpty())
{
return;
}
ShopService srv;
if (m_voucher.isNull())
@@ -172,6 +179,9 @@ void ShopForm::on_loadButton_clicked()
}
srv.moveItems(form->selectedItems(), form->selectedVoucher(), this->m_voucher);
m_voucher->setDescription(form->selectedVoucher()->description());
m_voucher->setName(form->selectedVoucher()->name());
m_voucher->setContact(form->selectedVoucher()->contact());
m_itemsModel->setData(m_voucher->items());