From 0aaea184e5918fa0a4e9653039786b3e1749baf0 Mon Sep 17 00:00:00 2001 From: Tobias Date: Sun, 30 Sep 2018 15:48:27 +1300 Subject: [PATCH] Final shirt changes --- docker/deploy_with_sqlite.sh | 2 +- fixtures/2019_registrasion.json | 13 ------------- pinaxcon/templates/flatpages/shirts.html | 4 ++-- 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/docker/deploy_with_sqlite.sh b/docker/deploy_with_sqlite.sh index 6b0a0b2f..d2af0cdd 100755 --- a/docker/deploy_with_sqlite.sh +++ b/docker/deploy_with_sqlite.sh @@ -2,7 +2,7 @@ /usr/local/bin/python /app/symposion_app/manage.py migrate /usr/local/bin/python /app/symposion_app/manage.py loaddata /app/symposion_app/fixtures/{conference,proposal_base,sites,flatpages}.json -/usr/local/bin/python /app/symposion_app/manage.py loaddata /app/symposion_app/fixtures/{2019_groups,2019_registrasion,2019_schedule,2019_sitetree,2019_flatpages}.json +/usr/local/bin/python /app/symposion_app/manage.py loaddata /app/symposion_app/fixtures/{2019_groups,2019_registrasion,2019_schedule,2019_flatpages,2019_sitetree,2019_sections}.json /usr/local/bin/python /app/symposion_app/manage.py create_review_permissions #/usr/local/bin/python /app/symposion_app/manage.py populate_inventory diff --git a/fixtures/2019_registrasion.json b/fixtures/2019_registrasion.json index 80f1f5e5..1b4525dd 100644 --- a/fixtures/2019_registrasion.json +++ b/fixtures/2019_registrasion.json @@ -370,19 +370,6 @@ "order": 60 } }, -{ - "model": "registrasion.product", - "pk": 28, - "fields": { - "name": "Men's Outline Tee 4XL", - "description": "", - "category": 6, - "price": "25.00", - "limit_per_user": null, - "reservation_duration": "01:00:00", - "order": 70 - } -}, { "model": "registrasion.product", "pk": 29, diff --git a/pinaxcon/templates/flatpages/shirts.html b/pinaxcon/templates/flatpages/shirts.html index f37ca2fd..1bf2e649 100644 --- a/pinaxcon/templates/flatpages/shirts.html +++ b/pinaxcon/templates/flatpages/shirts.html @@ -74,7 +74,7 @@ 60 64 68 - .. + na 76 @@ -85,7 +85,7 @@ 81 84 87 - .. + na 93