Merge branch 'master' of https://git.bukova.info/repos/git/prodejna
This commit is contained in:
@@ -17,7 +17,7 @@
|
||||
<item>
|
||||
<widget class="QTabWidget" name="tabWidget">
|
||||
<property name="currentIndex">
|
||||
<number>2</number>
|
||||
<number>0</number>
|
||||
</property>
|
||||
<widget class="QWidget" name="tab">
|
||||
<attribute name="title">
|
||||
|
||||
@@ -392,6 +392,7 @@ void ShopForm::on_commoditySearch_textChanged(const QString &text)
|
||||
QSortFilterProxyModel proxy;
|
||||
proxy.setSourceModel(m_commodityModel);
|
||||
proxy.setFilterKeyColumn(0);
|
||||
proxy.setFilterCaseSensitivity(Qt::CaseInsensitive);
|
||||
proxy.setFilterFixedString(text);
|
||||
|
||||
auto moveToIndex = [this](const QModelIndex &matchingIndex) {
|
||||
|
||||
@@ -247,6 +247,11 @@ void ShopService::moveItems(QList<VoucherItemPtr> items, VoucherPtr source, Vouc
|
||||
{
|
||||
erase(source);
|
||||
}
|
||||
else
|
||||
{
|
||||
calculate(source);
|
||||
update(source);
|
||||
}
|
||||
|
||||
tx.commit();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user