mirror of
https://github.com/pretix/pretix.git
synced 2026-02-07 02:52:27 +00:00
Compare commits
3 Commits
fix-mail-h
...
fix-addon-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1752e2a9db | ||
|
|
dc49d5bcf7 | ||
|
|
d4460045b4 |
@@ -95,6 +95,7 @@ class OrganizerSlugBanlistValidator(BanlistValidator):
|
||||
'csp_report',
|
||||
'widget',
|
||||
'lead',
|
||||
'scheduling',
|
||||
]
|
||||
|
||||
|
||||
|
||||
@@ -1510,7 +1510,10 @@ class OrderChangeMixin:
|
||||
'max_count': iao.max_count,
|
||||
'iao': iao,
|
||||
'items': [i for i in items if not i.require_voucher],
|
||||
'items_missing': {k: v for k, v in current_addon_products_missing.items() if v},
|
||||
'items_missing': {
|
||||
k: v for k, v in current_addon_products_missing.items()
|
||||
if v and k[0].category_id == iao.addon_category_id
|
||||
},
|
||||
})
|
||||
|
||||
return positions
|
||||
|
||||
@@ -674,11 +674,10 @@ var editor = {
|
||||
$("#toolbox").find("button[data-action=middle]").toggleClass('active', o.verticalAlign === 'middle');
|
||||
$("#toolbox").find("button[data-action=bottom]").toggleClass('active', o.verticalAlign === 'bottom');
|
||||
|
||||
console.log("_update_toolbox_values", o.scaleY, o.scaleX)
|
||||
if (o.scaleY !== 1 || o.scaleX !== 1) {
|
||||
o.set({
|
||||
height: Math.max(o.height * o.scaleY, editor._mm2px(10.01)),
|
||||
width: Math.max(o.width * o.scaleX, editor._mm2px(10.01)),
|
||||
height: o.height * o.scaleY,
|
||||
width: o.width * o.scaleX,
|
||||
scaleX: 1,
|
||||
scaleY: 1
|
||||
});
|
||||
|
||||
@@ -170,7 +170,6 @@ def test_queue_state_sent(env):
|
||||
subject='Test',
|
||||
body_plain='Test',
|
||||
sender='sender@example.com',
|
||||
headers={},
|
||||
)
|
||||
assert m.status == OutgoingMail.STATUS_QUEUED
|
||||
mail_send_task.apply(kwargs={
|
||||
@@ -188,7 +187,6 @@ def test_queue_state_permanent_failure(env):
|
||||
subject='Test',
|
||||
body_plain='Test',
|
||||
sender='sender@example.com',
|
||||
headers={},
|
||||
)
|
||||
assert m.status == OutgoingMail.STATUS_QUEUED
|
||||
mail_send_task.apply(kwargs={
|
||||
@@ -210,7 +208,6 @@ def test_queue_state_retry_failure(env, monkeypatch):
|
||||
subject='Test',
|
||||
body_plain='Test',
|
||||
sender='sender@example.com',
|
||||
headers={},
|
||||
)
|
||||
assert m.status == OutgoingMail.STATUS_QUEUED
|
||||
mail_send_task.apply(kwargs={
|
||||
@@ -236,7 +233,6 @@ def test_queue_state_foreign_key_handling():
|
||||
subject='Test',
|
||||
body_plain='Test',
|
||||
sender='sender@example.com',
|
||||
headers={},
|
||||
)
|
||||
mail_sent = OutgoingMail.objects.create(
|
||||
organizer=o,
|
||||
@@ -245,7 +241,6 @@ def test_queue_state_foreign_key_handling():
|
||||
subject='Test',
|
||||
body_plain='Test',
|
||||
sender='sender@example.com',
|
||||
headers={},
|
||||
status=OutgoingMail.STATUS_SENT,
|
||||
)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user