Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion db/models/sale.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class Sale(Base):
datetime_return: Mapped[DateTime | None] = mapped_column(
DateTime, comment="Дата и время возврата продажи"
)
bank_return: Mapped[str | None | None] = mapped_column(
bank_return: Mapped[str | None] = mapped_column(
Text, comment="Банковский чек возврата"
)
partial_return: Mapped[int] = mapped_column(
Expand Down
2 changes: 1 addition & 1 deletion design/logic/authorization.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from PySide6.QtWidgets import QFrame, QLabel, QLineEdit, QPushButton


class Ui_Dialog(object):
class Ui_Dialog:
def setupUi(self, Dialog):
if not Dialog.objectName():
Dialog.setObjectName("Dialog")
Expand Down
2 changes: 1 addition & 1 deletion design/logic/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
)


class Ui_Dialog_Client(object):
class Ui_Dialog_Client:
def setupUi(self, Dialog_Client):
if not Dialog_Client.objectName():
Dialog_Client.setObjectName("Dialog_Client")
Expand Down
4 changes: 2 additions & 2 deletions design/logic/main_form.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
QPushButton,
QRadioButton,
QStatusBar,
QTabWidget,
QTableWidget,
QTableWidgetItem,
QTabWidget,
QWidget,
)


class Ui_MainWindow(object):
class Ui_MainWindow:
def setupUi(self, MainWindow):
if not MainWindow.objectName():
MainWindow.setObjectName("MainWindow")
Expand Down
4 changes: 2 additions & 2 deletions design/logic/pay.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
from PySide6.QtCore import QCoreApplication, QMetaObject, QRect, QSize, Qt
from PySide6.QtGui import QFont
from PySide6.QtWidgets import QGroupBox, QLabel, QPushButton, QCheckBox
from PySide6.QtWidgets import QCheckBox, QGroupBox, QLabel, QPushButton


class Ui_Dialog_Pay(object):
class Ui_Dialog_Pay:
def setupUi(self, Dialog_Pay):
if not Dialog_Pay.objectName():
Dialog_Pay.setObjectName("Dialog_Pay")
Expand Down
36 changes: 24 additions & 12 deletions design/logic/progress_dialog.py
Original file line number Diff line number Diff line change
@@ -1,38 +1,50 @@
from PySide6.QtCore import (QCoreApplication, QMetaObject, QSize, Qt)
from PySide6.QtWidgets import (QLabel, QProgressBar,
QVBoxLayout)
from PySide6.QtCore import QCoreApplication, QMetaObject, QSize, Qt
from PySide6.QtWidgets import QLabel, QProgressBar, QVBoxLayout

class Ui_ProgressDialog(object):

class Ui_ProgressDialog:
def setupUi(self, ProgressDialog):
if not ProgressDialog.objectName():
ProgressDialog.setObjectName(u"ProgressDialog")
ProgressDialog.setObjectName("ProgressDialog")
ProgressDialog.resize(300, 127)
ProgressDialog.setMinimumSize(QSize(300, 100))
self.verticalLayout = QVBoxLayout(ProgressDialog)
self.verticalLayout.setObjectName(u"verticalLayout")
self.verticalLayout.setObjectName("verticalLayout")
self.label_status = QLabel(ProgressDialog)
self.label_status.setObjectName(u"label_status")
self.label_status.setObjectName("label_status")
self.label_status.setAlignment(Qt.AlignmentFlag.AlignCenter)

self.verticalLayout.addWidget(self.label_status)

self.progressBar = QProgressBar(ProgressDialog)
self.progressBar.setObjectName(u"progressBar")
self.progressBar.setObjectName("progressBar")
self.progressBar.setMinimum(0)
self.progressBar.setMaximum(100)
self.progressBar.setValue(0)
self.progressBar.setTextVisible(True)

self.verticalLayout.addWidget(self.progressBar)


self.retranslateUi(ProgressDialog)

QMetaObject.connectSlotsByName(ProgressDialog)

# setupUi

def retranslateUi(self, ProgressDialog):
ProgressDialog.setWindowTitle(QCoreApplication.translate("ProgressDialog", u"\u0421\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u0438\u0435...", None))
self.label_status.setText(QCoreApplication.translate("ProgressDialog", u"\u041d\u0430\u0447\u0430\u043b\u043e \u043e\u043f\u0435\u0440\u0430\u0446\u0438\u0438...", None))
# retranslateUi
ProgressDialog.setWindowTitle(
QCoreApplication.translate(
"ProgressDialog",
"\u0421\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u0438\u0435...",
None,
)
)
self.label_status.setText(
QCoreApplication.translate(
"ProgressDialog",
"\u041d\u0430\u0447\u0430\u043b\u043e \u043e\u043f\u0435\u0440\u0430\u0446\u0438\u0438...",
None,
)
)

# retranslateUi
2 changes: 1 addition & 1 deletion design/logic/sale.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
)


class Ui_Dialog_Sale(object):
class Ui_Dialog_Sale:
def setupUi(self, Dialog_Sale):
if not Dialog_Sale.objectName():
Dialog_Sale.setObjectName("Dialog_Sale")
Expand Down
2 changes: 1 addition & 1 deletion design/logic/slip.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from PySide6.QtWidgets import QLabel, QLineEdit, QTabWidget, QTextEdit, QWidget


class Ui_Dialog_Slip(object):
class Ui_Dialog_Slip:
def setupUi(self, Dialog_Slip):
if not Dialog_Slip.objectName():
Dialog_Slip.setObjectName("Dialog_Slip")
Expand Down
Loading