Compare commits

...

37 Commits

Author SHA1 Message Date
zino
f959ad27f5 Merge pull request 'staging' (#20) from staging into master
Reviewed-on: http://localhost:3000/zino/seatmapv2/pulls/20
2021-09-30 16:09:44 +02:00
zino
468f0a46b0 added coupon successfull message to prevent inject 2021-09-30 16:07:41 +02:00
zino
27aa67889f added coupon code box inject dependency 2021-09-30 14:57:49 +02:00
zino
8153040f0e Merge pull request 'staging' (#19) from staging into master
Reviewed-on: http://localhost:3000/zino/seatmapv2/pulls/19
2021-08-04 19:42:25 +02:00
zino
e707d378cc whitespace removal 2021-08-04 19:24:09 +02:00
zino
55498c9ee6 Merge pull request 'fixed sort highest amount: needed parseFloat for right sort, were strings before' (#18) from staging into master
Reviewed-on: http://localhost:3000/zino/seatmapv2/pulls/18
2021-08-04 17:47:51 +02:00
zino
d1f2afaccf Merge pull request 'added border to seatmap unavailable and available cells to make white seats visible' (#17) from staging into master
Reviewed-on: http://localhost:3000/zino/seatmapv2/pulls/17
2021-08-04 15:33:47 +02:00
zino
6bb67a1f4f Merge pull request 'staging' (#16) from staging into master
Reviewed-on: http://localhost:3000/zino/seatmapv2/pulls/16
2021-07-28 16:45:21 +02:00
zino
d432d8c0a9 Merge pull request 'sorted buyer types in cart popup highest price first' (#15) from staging into master
Reviewed-on: http://localhost:3000/zino/seatmapv2/pulls/15
2021-07-28 10:13:30 +02:00
zino
2558178994 Merge pull request 'staging' (#14) from staging into master
Reviewed-on: http://localhost:3000/zino/seatmapv2/pulls/14
2021-06-10 14:19:37 +02:00
zino
a0a41ca3eb merge && npm run prod 2021-05-31 16:16:25 +02:00
zino
5813b84fc5 Merge pull request 'staging' (#12) from staging into master
Reviewed-on: http://localhost:3000/zino/seatmapv2/pulls/12
2021-05-31 16:13:40 +02:00
zino
ad7d867600 npm run prod 2021-05-28 17:41:02 +02:00
zino
48f9cfa321 Merge pull request 'staging' (#10) from staging into master
Reviewed-on: http://localhost:3000/zino/seatmapv2/pulls/10
2021-05-28 17:38:48 +02:00
zino
25d2c51328 npm run prod 2021-05-28 12:20:44 +02:00
zino
8f1b7bb786 Merge pull request 'staging' (#8) from staging into master
Reviewed-on: http://localhost:3000/zino/seatmapv2/pulls/8
2021-05-28 12:17:46 +02:00
zino
3b45932549 npm run prod 2021-05-27 16:16:35 +02:00
zino
493cd6852f changed branch to master after resolving conflict 2021-05-27 16:14:28 +02:00
zino
6915b831cf Merge remote-tracking branch 'origin/staging' 2021-05-27 16:07:05 +02:00
zino
d4af93a44a npm run prod 2021-05-27 16:03:41 +02:00
zino
5aaaa50dbe Merge branches 'master' and 'master' of ssh://gitea/zino/seatmapv2 2021-05-27 15:57:39 +02:00
zino
c0db2e3251 Merge pull request 'staging' (#7) from staging into master
Reviewed-on: http://localhost:3000/zino/seatmapv2/pulls/7
2021-05-27 15:56:30 +02:00
zino
9499f2d5d7 Merge branch 'master' of ssh://gitea/zino/seatmapv2 2021-05-24 14:40:09 +02:00
zino
456ac53443 Merge pull request 'staging' (#6) from staging into master
Reviewed-on: http://localhost:3000/zino/seatmapv2/pulls/6
2021-05-24 14:39:53 +02:00
zino
6339c51235 Merge remote-tracking branch 'origin/staging' 2021-05-24 14:37:20 +02:00
zino
9896fa1488 npm run prod 2021-05-23 23:02:55 +02:00
zino
2ed30c5630 Merge remote-tracking branch 'origin/staging' 2021-05-23 23:00:50 +02:00
zino
d80ac6a19f Merge remote-tracking branch 'origin/staging' 2021-05-23 22:44:57 +02:00
zino
35f914f938 gitattributes not needed 2021-05-23 19:51:05 +02:00
zino
e73ecc8747 Merge pull request 'Update 'client/tsconfig.json'' (#4) from staging into master
Reviewed-on: http://localhost:3000/zino/seatmapv2/pulls/4
2021-05-23 02:04:43 +02:00
zino
99752b9e32 Merge branch 'master' of ssh://gitea/zino/seatmapv2 2021-05-23 02:01:16 +02:00
zino
22e5afeb3f added gitattributes and driver ours 2021-05-23 02:01:07 +02:00
zino
91826bd305 Merge pull request 'staging' (#2) from staging into master
Reviewed-on: http://localhost:3000/zino/seatmapv2/pulls/2
2021-05-23 01:59:38 +02:00
zino
500d23b117 Merge branch 'staging' of ssh://gitea/zino/seatmapv2 2021-05-21 21:58:32 +02:00
zino
e45825a9dc Merge remote-tracking branch 'origin/staging' 2021-05-21 21:44:03 +02:00
zino
4f2ded59cb minify true 2021-05-21 21:22:30 +02:00
zino
27c4e2043f Merge pull request 'staging' (#1) from staging into master
Reviewed-on: http://localhost:3000/zino/seatmapv2/pulls/1
2021-05-21 00:25:40 +02:00
8 changed files with 3280 additions and 6 deletions

1
.gitattributes vendored Normal file
View File

@@ -0,0 +1 @@
#package.json merge=ours

1
client/dist/inject.css vendored Normal file
View File

@@ -0,0 +1 @@
#containerBookingBtn{display:none;margin:0;text-align:center}#get_flash{display:none}.ui-dialog-title{text-align:center;display:none}.ui-widget-overlay{background:#fff;opacity:1;width:100vw;height:100vh}#openSeatmap img{width:64px}#openSeatmap{padding:1rem!important;cursor:pointer;border-radius:5px}#openSeatmap span{font-size:1.2rem}#foobarParent{display:none}div#dialogSeatmap{padding-top:0}.ui-widget-header{background:#fff;border:1px solid #c6c6c6;border-bottom-right-radius:0;border-bottom-left-radius:0}.ui-dialog{background:#fff;left:0!important;padding:0;top:0!important;right:0!important}.ui-dialog .ui-dialog-content{padding:0}.ui-dialog-titlebar{margin-left:0;margin-right:0;padding:0!important;display:none}#iframeSeatmap{height:100vh;background:#fff;width:100%}.ui-corner-all{border-radius:0}.ui-widget{border:none!important}

1635
client/dist/inject.js vendored Normal file

File diff suppressed because one or more lines are too long

1
client/dist/seatmap.css vendored Normal file

File diff suppressed because one or more lines are too long

1635
client/dist/seatmap.js vendored Normal file

File diff suppressed because one or more lines are too long

View File

@@ -15,18 +15,21 @@ window.addEventListener('load', () => {
// Parse (hidden) inputs and their values // Parse (hidden) inputs and their values
const content: string = new XMLSerializer().serializeToString(document); const content: string = new XMLSerializer().serializeToString(document);
inputsWithValue = { ...inputsWithValue, ...Parser.getInputs(content) }; inputsWithValue = { ...inputsWithValue, ...Parser.getInputs(content) };
if (jQuery("#get_flash").length) jQuery("#get_flash").hide();
Utils.consoleLog(inputsWithValue); Utils.consoleLog(inputsWithValue);
Utils.consoleLog(`trxstate: ${inputsWithValue["trxstate"]}`); Utils.consoleLog(`trxstate: ${inputsWithValue["trxstate"]}`);
// "posturl" in function showMap() only available if "pvmapse" PVO code is true. // "posturl" in function showMap() only available if "pvmapse" is true, false disables seatmap
// "pvmapse" false disables seatmap
const posturlAvail: boolean = /posturl:"(.+?)"/.test(content); const posturlAvail: boolean = /posturl:"(.+?)"/.test(content);
const couponCodeBoxAvail: boolean = !!jQuery("#coupon_code_box").length;
const couponSuccessfull: boolean = !!jQuery("#coupon_successful").length;
Utils.consoleLog(`couponCodeBoxAvail: ${couponCodeBoxAvail}`);
Utils.consoleLog(`posturl available: ${posturlAvail}`); Utils.consoleLog(`posturl available: ${posturlAvail}`);
// Only inject on page with trxstate 20 and if seatmap is enabled with PVO code "pvmapse" // Only inject on page with trxstate 20 and if seatmap is enabled with PVO code "pvmapse"
if (inputsWithValue["trxstate"] !== "20" || posturlAvail === false) if (inputsWithValue["trxstate"] !== "20" || posturlAvail === false || couponCodeBoxAvail === true || couponSuccessfull === true)
return; return;
// Inject parent CSS // Inject parent CSS

View File

@@ -3,7 +3,7 @@ import * as I from "../types/types";
export const config: I.Config = { export const config: I.Config = {
childHasVenueXML: false, childHasVenueXML: false,
debug: true, debug: true,
branch: "staging", branch: "master",
version: "0.2.0", version: "0.2.0",
maxSelectedSeats: 10, maxSelectedSeats: 10,
resources: { resources: {

View File

@@ -18,8 +18,6 @@ export function convertLegendToDropdown(inID: string): void {
} }
export function generateLegend(inNode: string): I.JSCLegend { export function generateLegend(inNode: string): I.JSCLegend {
return <I.JSCLegend>{ return <I.JSCLegend>{
node: jQuery(inNode), node: jQuery(inNode),
items: createLegendItems() items: createLegendItems()