Skip to content

Commit 1bfea59

Browse files
AndreWohnslandAndreWohnsland
committed
make subtabs in config for payment
1 parent 03bb4fc commit 1bfea59

File tree

8 files changed

+328
-52
lines changed

8 files changed

+328
-52
lines changed

‎src/config/config_manager.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,10 +133,10 @@ class ConfigManager:
133133
# Payment related configurations
134134
PAYMENT_TYPE: SupportedPaymentOptions = "Disabled"
135135
PAYMENT_PRICE_ROUNDING: float = 0.25
136+
PAYMENT_VIRGIN_MULTIPLIER: int = 80
136137
PAYMENT_TIMEOUT_S: int = 20
137138
PAYMENT_SHOW_NOT_POSSIBLE: bool = True
138139
PAYMENT_LOCK_SCREEN_NO_USER: bool = True
139-
PAYMENT_VIRGIN_MULTIPLIER: int = 80
140140
PAYMENT_SERVICE_URL: str = "http://127.0.0.1:9876"
141141
PAYMENT_SECRET_KEY: str = "CocktailBerry-Secret-Change-Me"
142142
PAYMENT_SUMUP_API_KEY: str = ""

‎src/ui/create_config_window.py‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ def _init_ui(self) -> None:
7777
# other window may have little elements and spacing is bad,
7878
# so add a spacer to the end
7979
self.vbox_other.addItem(create_spacer(1, expand=True))
80+
# same for the sumup payment tab
81+
self.vbox_payment_sumup.addItem(create_spacer(1, expand=True))
8082

8183
def _save_config(self) -> None:
8284
try:
@@ -342,6 +344,19 @@ def _choose_tab_container(self, config_name: str) -> QVBoxLayout:
342344
"MAKER_REVERSION_PIN",
343345
"MAKER_PINS_INVERTED",
344346
),
347+
self.vbox_payment_cocktailberry: (
348+
"PAYMENT_SHOW_NOT_POSSIBLE",
349+
"PAYMENT_LOCK_SCREEN_NO_USER",
350+
"PAYMENT_SERVICE_URL",
351+
"PAYMENT_SECRET_KEY",
352+
"PAYMENT_AUTO_LOGOUT_TIME_S",
353+
"PAYMENT_LOGOUT_AFTER_PREPARATION",
354+
),
355+
self.vbox_payment_sumup: (
356+
"PAYMENT_SUMUP_API_KEY",
357+
"PAYMENT_SUMUP_MERCHANT_CODE",
358+
"PAYMENT_SUMUP_TERMINAL_ID",
359+
),
345360
}
346361
for key, value in exact_sorting.items():
347362
if config_name in value:

‎src/ui_elements/config_window.py‎

Lines changed: 46 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ def setupUi(self, ConfigWindow):
3232
font = QtGui.QFont()
3333
font.setPointSize(14)
3434
font.setBold(True)
35-
font.setWeight(75)
3635
self.tabs_option.setFont(font)
3736
self.tabs_option.setDocumentMode(False)
3837
self.tabs_option.setObjectName("tabs_option")
@@ -48,7 +47,7 @@ def setupUi(self, ConfigWindow):
4847
self.scrollArea_ui.setWidgetResizable(True)
4948
self.scrollArea_ui.setObjectName("scrollArea_ui")
5049
self.scrollAreaWidgetContents = QtWidgets.QWidget()
51-
self.scrollAreaWidgetContents.setGeometry(QtCore.QRect(0, 0, 793, 398))
50+
self.scrollAreaWidgetContents.setGeometry(QtCore.QRect(0, 0, 793, 395))
5251
self.scrollAreaWidgetContents.setObjectName("scrollAreaWidgetContents")
5352
self.verticalLayout_4 = QtWidgets.QVBoxLayout(self.scrollAreaWidgetContents)
5453
self.verticalLayout_4.setContentsMargins(0, 0, 0, 0)
@@ -73,7 +72,7 @@ def setupUi(self, ConfigWindow):
7372
self.scrollArea_maker.setWidgetResizable(True)
7473
self.scrollArea_maker.setObjectName("scrollArea_maker")
7574
self.scrollAreaWidgetContents_2 = QtWidgets.QWidget()
76-
self.scrollAreaWidgetContents_2.setGeometry(QtCore.QRect(0, 0, 100, 30))
75+
self.scrollAreaWidgetContents_2.setGeometry(QtCore.QRect(0, 0, 793, 395))
7776
self.scrollAreaWidgetContents_2.setObjectName("scrollAreaWidgetContents_2")
7877
self.verticalLayout_5 = QtWidgets.QVBoxLayout(self.scrollAreaWidgetContents_2)
7978
self.verticalLayout_5.setContentsMargins(0, 0, 0, 0)
@@ -97,7 +96,7 @@ def setupUi(self, ConfigWindow):
9796
self.scrollArea_hardware.setWidgetResizable(True)
9897
self.scrollArea_hardware.setObjectName("scrollArea_hardware")
9998
self.scrollAreaWidgetContents_3 = QtWidgets.QWidget()
100-
self.scrollAreaWidgetContents_3.setGeometry(QtCore.QRect(0, 0, 100, 30))
99+
self.scrollAreaWidgetContents_3.setGeometry(QtCore.QRect(0, 0, 793, 395))
101100
self.scrollAreaWidgetContents_3.setObjectName("scrollAreaWidgetContents_3")
102101
self.verticalLayout_7 = QtWidgets.QVBoxLayout(self.scrollAreaWidgetContents_3)
103102
self.verticalLayout_7.setContentsMargins(0, 0, 0, 0)
@@ -121,7 +120,7 @@ def setupUi(self, ConfigWindow):
121120
self.scrollArea_software.setWidgetResizable(True)
122121
self.scrollArea_software.setObjectName("scrollArea_software")
123122
self.scrollAreaWidgetContents_4 = QtWidgets.QWidget()
124-
self.scrollAreaWidgetContents_4.setGeometry(QtCore.QRect(0, 0, 100, 30))
123+
self.scrollAreaWidgetContents_4.setGeometry(QtCore.QRect(0, 0, 793, 395))
125124
self.scrollAreaWidgetContents_4.setObjectName("scrollAreaWidgetContents_4")
126125
self.verticalLayout_9 = QtWidgets.QVBoxLayout(self.scrollAreaWidgetContents_4)
127126
self.verticalLayout_9.setContentsMargins(0, 0, 0, 0)
@@ -144,15 +143,48 @@ def setupUi(self, ConfigWindow):
144143
self.scrollArea_payment.setWidgetResizable(True)
145144
self.scrollArea_payment.setObjectName("scrollArea_payment")
146145
self.scrollAreaWidgetContents_6 = QtWidgets.QWidget()
147-
self.scrollAreaWidgetContents_6.setGeometry(QtCore.QRect(0, 0, 100, 30))
146+
self.scrollAreaWidgetContents_6.setGeometry(QtCore.QRect(0, 0, 775, 377))
148147
self.scrollAreaWidgetContents_6.setObjectName("scrollAreaWidgetContents_6")
149148
self.verticalLayout_13 = QtWidgets.QVBoxLayout(self.scrollAreaWidgetContents_6)
150149
self.verticalLayout_13.setContentsMargins(0, 0, 0, 0)
151150
self.verticalLayout_13.setObjectName("verticalLayout_13")
151+
self.vbox_payment_parent = QtWidgets.QVBoxLayout()
152+
self.vbox_payment_parent.setContentsMargins(1, 1, 1, 0)
153+
self.vbox_payment_parent.setObjectName("vbox_payment_parent")
152154
self.vbox_payment = QtWidgets.QVBoxLayout()
153155
self.vbox_payment.setContentsMargins(9, 3, 6, 15)
154156
self.vbox_payment.setObjectName("vbox_payment")
155-
self.verticalLayout_13.addLayout(self.vbox_payment)
157+
self.vbox_payment_parent.addLayout(self.vbox_payment)
158+
self.tabs_payment_option = QtWidgets.QTabWidget(parent=self.scrollAreaWidgetContents_6)
159+
font = QtGui.QFont()
160+
font.setPointSize(14)
161+
font.setBold(True)
162+
self.tabs_payment_option.setFont(font)
163+
self.tabs_payment_option.setDocumentMode(False)
164+
self.tabs_payment_option.setObjectName("tabs_payment_option")
165+
self.tab_payment_cocktailberry = QtWidgets.QWidget()
166+
self.tab_payment_cocktailberry.setObjectName("tab_payment_cocktailberry")
167+
self.verticalLayout_14 = QtWidgets.QVBoxLayout(self.tab_payment_cocktailberry)
168+
self.verticalLayout_14.setContentsMargins(0, 0, 0, 0)
169+
self.verticalLayout_14.setObjectName("verticalLayout_14")
170+
self.vbox_payment_cocktailberry = QtWidgets.QVBoxLayout()
171+
self.vbox_payment_cocktailberry.setContentsMargins(9, 3, 6, 15)
172+
self.vbox_payment_cocktailberry.setSpacing(6)
173+
self.vbox_payment_cocktailberry.setObjectName("vbox_payment_cocktailberry")
174+
self.verticalLayout_14.addLayout(self.vbox_payment_cocktailberry)
175+
self.tabs_payment_option.addTab(self.tab_payment_cocktailberry, "")
176+
self.tab_payment_sumup = QtWidgets.QWidget()
177+
self.tab_payment_sumup.setObjectName("tab_payment_sumup")
178+
self.verticalLayout_16 = QtWidgets.QVBoxLayout(self.tab_payment_sumup)
179+
self.verticalLayout_16.setContentsMargins(0, 0, 0, 0)
180+
self.verticalLayout_16.setObjectName("verticalLayout_16")
181+
self.vbox_payment_sumup = QtWidgets.QVBoxLayout()
182+
self.vbox_payment_sumup.setContentsMargins(9, 3, 6, 15)
183+
self.vbox_payment_sumup.setObjectName("vbox_payment_sumup")
184+
self.verticalLayout_16.addLayout(self.vbox_payment_sumup)
185+
self.tabs_payment_option.addTab(self.tab_payment_sumup, "")
186+
self.vbox_payment_parent.addWidget(self.tabs_payment_option)
187+
self.verticalLayout_13.addLayout(self.vbox_payment_parent)
156188
self.scrollArea_payment.setWidget(self.scrollAreaWidgetContents_6)
157189
self.verticalLayout_2.addWidget(self.scrollArea_payment)
158190
self.tabs_option.addTab(self.tab_payment, "")
@@ -168,7 +200,7 @@ def setupUi(self, ConfigWindow):
168200
self.scrollArea_other.setWidgetResizable(True)
169201
self.scrollArea_other.setObjectName("scrollArea_other")
170202
self.scrollAreaWidgetContents_5 = QtWidgets.QWidget()
171-
self.scrollAreaWidgetContents_5.setGeometry(QtCore.QRect(0, 0, 100, 30))
203+
self.scrollAreaWidgetContents_5.setGeometry(QtCore.QRect(0, 0, 793, 395))
172204
self.scrollAreaWidgetContents_5.setObjectName("scrollAreaWidgetContents_5")
173205
self.verticalLayout_11 = QtWidgets.QVBoxLayout(self.scrollAreaWidgetContents_5)
174206
self.verticalLayout_11.setContentsMargins(0, 0, 0, 0)
@@ -190,7 +222,6 @@ def setupUi(self, ConfigWindow):
190222
font = QtGui.QFont()
191223
font.setPointSize(20)
192224
font.setBold(True)
193-
font.setWeight(75)
194225
self.button_back.setFont(font)
195226
self.button_back.setProperty("cssClass", "")
196227
self.button_back.setObjectName("button_back")
@@ -201,7 +232,6 @@ def setupUi(self, ConfigWindow):
201232
font = QtGui.QFont()
202233
font.setPointSize(20)
203234
font.setBold(True)
204-
font.setWeight(75)
205235
self.button_save.setFont(font)
206236
self.button_save.setObjectName("button_save")
207237
self.horizontalLayout.addWidget(self.button_save)
@@ -210,6 +240,7 @@ def setupUi(self, ConfigWindow):
210240

211241
self.retranslateUi(ConfigWindow)
212242
self.tabs_option.setCurrentIndex(0)
243+
self.tabs_payment_option.setCurrentIndex(0)
213244
QtCore.QMetaObject.connectSlotsByName(ConfigWindow)
214245

215246
def retranslateUi(self, ConfigWindow):
@@ -224,6 +255,11 @@ def retranslateUi(self, ConfigWindow):
224255
self.tabs_option.setTabText(self.tabs_option.indexOf(self.tab_hardware), _translate("ConfigWindow", " Hardware "))
225256
self.tab_software.setProperty("cssClass", _translate("ConfigWindow", "tabs-padded"))
226257
self.tabs_option.setTabText(self.tabs_option.indexOf(self.tab_software), _translate("ConfigWindow", " Software "))
258+
self.tabs_payment_option.setProperty("cssClass", _translate("ConfigWindow", "tabs-padded"))
259+
self.tab_payment_cocktailberry.setProperty("cssClass", _translate("ConfigWindow", "tabs-padded"))
260+
self.tabs_payment_option.setTabText(self.tabs_payment_option.indexOf(self.tab_payment_cocktailberry), _translate("ConfigWindow", " CocktailBerry "))
261+
self.tab_payment_sumup.setProperty("cssClass", _translate("ConfigWindow", "tabs-padded"))
262+
self.tabs_payment_option.setTabText(self.tabs_payment_option.indexOf(self.tab_payment_sumup), _translate("ConfigWindow", " SumUp "))
227263
self.tabs_option.setTabText(self.tabs_option.indexOf(self.tab_payment), _translate("ConfigWindow", " Payment "))
228264
self.tab_other.setProperty("cssClass", _translate("ConfigWindow", "tabs-padded"))
229265
self.tabs_option.setTabText(self.tabs_option.indexOf(self.tab_other), _translate("ConfigWindow", " Other "))

0 commit comments

Comments
 (0)