Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #1

Open
wants to merge 2,225 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2225 commits
Select commit Hold shift + click to select a range
db3d40c
changes
shanabuzar Jan 1, 2017
7a7370d
Pie charts added
shanabuzar Jan 1, 2017
158cb19
pie chart added
shanabuzar Jan 2, 2017
9714d79
pie chart done
shanabuzar Jan 2, 2017
08a6c8b
changes
iqramujahid Jan 3, 2017
ba0974a
done dialog working
shanabuzar Jan 3, 2017
9821d2a
done
shanabuzar Jan 3, 2017
eebea8b
game response.
muzamilw Jan 3, 2017
1e0a81f
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
muzamilw Jan 3, 2017
869e53f
done
shanabuzar Jan 3, 2017
e447143
why?
shanabuzar Jan 3, 2017
4601a73
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
shanabuzar Jan 3, 2017
10a3a01
done
shanabuzar Jan 3, 2017
2fd98ac
changes
iqramujahid Jan 3, 2017
ec47220
changes
iqramujahid Jan 3, 2017
63b9525
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
iqramujahid Jan 3, 2017
5443310
chnages
iqramujahid Jan 4, 2017
66bc242
added default image in learn more about ppcv
shanabuzar Jan 4, 2017
79a88ae
changes for create button in all 4 campaigns
shanabuzar Jan 4, 2017
4c9df83
add new functionality on dashboards
shanabuzar Jan 4, 2017
3eb1d3a
done
shanabuzar Jan 4, 2017
d167a6e
changes
iqramujahid Jan 4, 2017
b368ca4
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
iqramujahid Jan 4, 2017
3ffd8ca
deal calculations updated
muzamilw Jan 4, 2017
761438b
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
muzamilw Jan 4, 2017
dec7505
done
shanabuzar Jan 5, 2017
d55ac0c
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
shanabuzar Jan 5, 2017
7147b20
implement scroll up button for all campaigns
shanabuzar Jan 5, 2017
8d0727e
changes
iqramujahid Jan 5, 2017
b1339de
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
iqramujahid Jan 5, 2017
0d2a517
special account
shanabuzar Jan 5, 2017
00de354
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
shanabuzar Jan 5, 2017
78343b1
done special accounts bugs
shanabuzar Jan 5, 2017
b9de3c2
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
shanabuzar Jan 5, 2017
38fb511
new changes by boss
shanabuzar Jan 5, 2017
9447cd6
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
shanabuzar Jan 5, 2017
edc3047
done
shanabuzar Jan 5, 2017
15ada19
changies
iqramujahid Jan 5, 2017
3b42ede
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
iqramujahid Jan 5, 2017
75bd85a
merge changes
shanabuzar Jan 5, 2017
bb4463c
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
shanabuzar Jan 5, 2017
46ffa45
submission emails.
muzamilw Jan 6, 2017
d576663
done
shanabuzar Jan 6, 2017
8945d92
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
muzamilw Jan 6, 2017
8350c20
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
shanabuzar Jan 6, 2017
5ea14b4
emails and exception handling.
muzamilw Jan 6, 2017
c69698b
done
shanabuzar Jan 6, 2017
c43ebe2
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
shanabuzar Jan 6, 2017
1cc5759
changes
iqramujahid Jan 6, 2017
4e19412
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
iqramujahid Jan 6, 2017
4f8432e
campaign submission emails formats.
muzamilw Jan 6, 2017
c99a63d
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
muzamilw Jan 6, 2017
abf2473
api changes.
muzamilw Jan 7, 2017
e998725
changes
iqramujahid Jan 9, 2017
8690c17
deal calc changes.
muzamilw Jan 9, 2017
8a91561
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
iqramujahid Jan 9, 2017
9bcd793
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
muzamilw Jan 9, 2017
43476cb
changes
shanabuzar Jan 9, 2017
fd3d039
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
shanabuzar Jan 9, 2017
68ed478
campaign count issue
shanabuzar Jan 9, 2017
5c7613b
changes
iqramujahid Jan 9, 2017
fd2cf0f
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
iqramujahid Jan 9, 2017
81d3174
review date.
muzamilw Jan 9, 2017
32511ef
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
muzamilw Jan 9, 2017
bcb9267
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
iqramujahid Jan 9, 2017
0ad5e19
usercouponCategoryClick
muzamilw Jan 9, 2017
97cd8ae
db change.
muzamilw Jan 9, 2017
f89ce62
db changes.
muzamilw Jan 9, 2017
1f401fa
done
shanabuzar Jan 9, 2017
fddf004
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
shanabuzar Jan 9, 2017
12af7c1
resolved add count issue
shanabuzar Jan 9, 2017
89dedf2
db changes.
muzamilw Jan 9, 2017
c90d5b3
dbchanges.
muzamilw Jan 9, 2017
cf06753
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
muzamilw Jan 9, 2017
e7ae5f0
changings
iqramujahid Jan 9, 2017
64b4672
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
iqramujahid Jan 9, 2017
1920a9c
changes
iqramujahid Jan 9, 2017
a9659f8
notification change,
muzamilw Jan 10, 2017
58d5988
notification and review changes.
muzamilw Jan 10, 2017
ffb6775
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
muzamilw Jan 10, 2017
9a398cd
view changes.
muzamilw Jan 10, 2017
3677a6f
done ads issue when click on chart
shanabuzar Jan 12, 2017
fa12781
done ui changes for dashboard and header text
shanabuzar Jan 12, 2017
63e897f
done account check out
shanabuzar Jan 12, 2017
1a429ae
email changes.
muzamilw Jan 13, 2017
2355e46
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
muzamilw Jan 13, 2017
d790a40
deal scheduler configurations
muzamilw Jan 13, 2017
0cf9c57
done
shanabuzar Jan 13, 2017
664c542
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
shanabuzar Jan 13, 2017
e6c5760
done popup for video display and Polls
shanabuzar Jan 13, 2017
b770fef
additional advertisign alert emails.
muzamilw Jan 13, 2017
f381bd7
additional alerts to advertiser jobs
muzamilw Jan 13, 2017
7f0f7df
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
muzamilw Jan 13, 2017
97ba9ca
done
shanabuzar Jan 14, 2017
807d8a2
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
shanabuzar Jan 14, 2017
a258d08
done
shanabuzar Jan 15, 2017
44e27cc
changes
iqramujahid Jan 16, 2017
2907478
add checks for popup
shanabuzar Jan 16, 2017
41fe9fe
changes
iqramujahid Jan 16, 2017
3eb5cb7
marging
shanabuzar Jan 16, 2017
f252e46
canges
iqramujahid Jan 16, 2017
638b796
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
shanabuzar Jan 16, 2017
a27b72e
changes.
muzamilw Jan 16, 2017
381123e
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
muzamilw Jan 16, 2017
7ff85da
done
shanabuzar Jan 16, 2017
a5a5178
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
shanabuzar Jan 16, 2017
28b93c0
changes
iqramujahid Jan 16, 2017
058d620
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
iqramujahid Jan 16, 2017
70031f7
poll changes done
shanabuzar Jan 16, 2017
2340bab
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
shanabuzar Jan 16, 2017
3bd6a8f
changes
iqramujahid Jan 16, 2017
dc49d21
api changes.
muzamilw Jan 16, 2017
397d7a0
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
muzamilw Jan 16, 2017
35a6a87
ui changes done
shanabuzar Jan 16, 2017
f5f6f6c
done
shanabuzar Jan 16, 2017
0026ce9
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
shanabuzar Jan 16, 2017
b006c40
done
shanabuzar Jan 16, 2017
3389516
changes
iqramujahid Jan 16, 2017
5889356
changes
iqramujahid Jan 16, 2017
a4a9ce1
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
iqramujahid Jan 16, 2017
d425d18
route changes.
muzamilw Jan 16, 2017
90f7e95
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
muzamilw Jan 16, 2017
7e2b476
UI changes
shanabuzar Jan 16, 2017
9323691
done
shanabuzar Jan 17, 2017
78fee5f
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
shanabuzar Jan 17, 2017
fa47cf7
done
shanabuzar Jan 17, 2017
18b2cd5
change.
muzamilw Jan 17, 2017
3e21b22
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
muzamilw Jan 17, 2017
9ae274e
done
shanabuzar Jan 17, 2017
6a57550
email changes.
muzamilw Jan 17, 2017
a2699ce
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
muzamilw Jan 17, 2017
703b3c4
Remove subscription functionality for pilot
shanabuzar Jan 17, 2017
7e24914
done
shanabuzar Jan 17, 2017
f467b83
EMAIL CHANGES.
muzamilw Jan 17, 2017
7604fce
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
muzamilw Jan 17, 2017
1397468
changes.
muzamilw Jan 17, 2017
dd4bef4
done
shanabuzar Jan 17, 2017
ac4aa9b
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
shanabuzar Jan 17, 2017
45bf240
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
shanabuzar Jan 17, 2017
7b5cb10
changes
shanabuzar Jan 17, 2017
e0679f5
done Rejection Reason
shanabuzar Jan 18, 2017
dcdadef
including files.
muzamilw Jan 18, 2017
e0bfd69
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
muzamilw Jan 18, 2017
053f783
done
shanabuzar Jan 18, 2017
9d32f30
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
shanabuzar Jan 18, 2017
fc61e14
done system poll ui changes
shanabuzar Jan 18, 2017
c6dd00f
user new columns added.
muzamilw Jan 18, 2017
0615fe8
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
muzamilw Jan 18, 2017
7acbdf9
done go social stuff on deal
shanabuzar Jan 18, 2017
5b14b11
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
shanabuzar Jan 18, 2017
6835356
email change.
muzamilw Jan 18, 2017
9117ece
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
muzamilw Jan 18, 2017
db997d3
done
shanabuzar Jan 18, 2017
21954b1
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
shanabuzar Jan 18, 2017
2a22773
done go social
shanabuzar Jan 18, 2017
918a192
dasd
iqramujahid Jan 18, 2017
6e03e70
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
iqramujahid Jan 18, 2017
e59b493
Poll changes
shanabuzar Jan 18, 2017
0533ad2
Video Grid changes
shanabuzar Jan 18, 2017
767624c
done
shanabuzar Jan 19, 2017
30cd03a
done
shanabuzar Jan 19, 2017
4e62ef7
deal changes
shanabuzar Jan 19, 2017
7116c40
new graphs added
shanabuzar Jan 22, 2017
27033a2
UI changes
shanabuzar Jan 22, 2017
e9bf374
db changes/
muzamilw Jan 22, 2017
4b4f595
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
muzamilw Jan 22, 2017
e4abef3
changes
shanabuzar Jan 22, 2017
84a0685
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
shanabuzar Jan 22, 2017
a0a63dc
changes
shanabuzar Jan 22, 2017
b24448b
sp update
muzamilw Jan 22, 2017
da44d19
SPs Added
shanabuzar Jan 22, 2017
6a8fc46
changes
shanabuzar Jan 22, 2017
d1bd6ec
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
shanabuzar Jan 22, 2017
8e08db0
db change,.
muzamilw Jan 23, 2017
48393f0
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
muzamilw Jan 23, 2017
1f00a6a
ddd
muzamilw Jan 23, 2017
e66b641
Charts changes
shanabuzar Jan 23, 2017
2615d13
merge changes
shanabuzar Jan 23, 2017
5b4130e
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
shanabuzar Jan 23, 2017
804092d
done
shanabuzar Jan 24, 2017
d1f6889
merge conflts
shanabuzar Jan 24, 2017
b704f4a
done
shanabuzar Jan 24, 2017
e0d6465
done
shanabuzar Jan 24, 2017
504e54a
done
shanabuzar Jan 24, 2017
208bbab
done
shanabuzar Jan 24, 2017
434355f
done
shanabuzar Jan 24, 2017
45197c2
changes
iqramujahid Jan 24, 2017
7241366
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
iqramujahid Jan 24, 2017
1b9b153
UI changes
shanabuzar Jan 24, 2017
7fc4e1d
done
shanabuzar Jan 25, 2017
8476181
chages
iqramujahid Jan 25, 2017
f86ae14
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
iqramujahid Jan 25, 2017
3ad8e0d
done
shanabuzar Jan 30, 2017
4d82d6e
add video ad credits in ads
shanabuzar Feb 2, 2017
035425d
done
shanabuzar Feb 2, 2017
0672b17
changes
iqramujahid Feb 2, 2017
8853dc1
done ui for deal video and picture poll
shanabuzar Feb 2, 2017
f780fc6
chagings
iqramujahid Feb 3, 2017
4d5846f
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
iqramujahid Feb 3, 2017
9a49526
changings
iqramujahid Feb 3, 2017
ae41f65
done changes
shanabuzar Feb 3, 2017
844b110
db changes.
muzamilw Feb 6, 2017
b0f51d5
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
iqramujahid Feb 6, 2017
45e60d6
done
shanabuzar Feb 6, 2017
7005de0
done
shanabuzar Feb 6, 2017
e22b0a1
changes
iqramujahid Feb 7, 2017
1f93aa2
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
iqramujahid Feb 7, 2017
f673aac
chnagings
iqramujahid Feb 7, 2017
30a4769
done
shanabuzar Feb 7, 2017
91902f6
done
shanabuzar Feb 7, 2017
c461460
done
shanabuzar Feb 7, 2017
b11b7f5
done
shanabuzar Feb 7, 2017
ce60fd2
done
shanabuzar Feb 8, 2017
c393528
changes
iqramujahid Feb 8, 2017
46789df
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
iqramujahid Feb 8, 2017
7167f9f
changings
iqramujahid Feb 9, 2017
b7c1b32
done
shanabuzar Feb 9, 2017
58f74fe
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
shanabuzar Feb 9, 2017
95590ea
done
shanabuzar Feb 10, 2017
b7d7e4a
done
shanabuzar Feb 10, 2017
0d05b7c
done
shanabuzar Feb 10, 2017
f48128f
changes
iqramujahid Feb 10, 2017
75bbacf
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
iqramujahid Feb 10, 2017
748ddbb
done
shanabuzar Feb 10, 2017
441e134
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
shanabuzar Feb 10, 2017
3a067b9
done
shanabuzar Feb 10, 2017
167a416
gdfgd
iqramujahid Feb 10, 2017
84fd9db
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
iqramujahid Feb 10, 2017
fde5da6
sdsadsad
shanabuzar Feb 10, 2017
dd20900
ddsf
iqramujahid Feb 10, 2017
4fec2b5
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
iqramujahid Feb 10, 2017
3661f8e
changings
iqramujahid Feb 16, 2017
7d5d689
working on Email promotion
shanabuzar Feb 17, 2017
0d16043
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
shanabuzar Feb 17, 2017
916c1d4
chnages
iqramujahid Feb 22, 2017
6f89b27
added email promotions
shanabuzar Mar 14, 2017
7ab8710
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
shanabuzar Mar 14, 2017
25600bd
changes
hadiatazeem Mar 27, 2017
7068394
Abuzar changes ... comitted by mz on 14 august 2017
shanabuzar Aug 14, 2017
214bfab
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
shanabuzar Aug 14, 2017
5730eb6
vs2015 host
muzamilw Aug 14, 2017
f4bf5dc
SMD working. fixed db.
muzamilw Jun 6, 2021
75c85a0
ui changes
muzamilw Jun 28, 2021
083b657
2nd set of ui changes
muzamilw Jul 2, 2021
6fbfe52
UI changes
muzamilw Jul 14, 2021
9b04b4a
db files added
muzamilw Aug 6, 2021
c1b06c9
ui changes in progress
muzamilw Aug 9, 2021
85cb79f
Merge branch 'dev' of https://github.com/muzamilw/SMD into dev
muzamilw Aug 9, 2021
a8c2dee
UI Changes in progress
muzamilw Aug 9, 2021
959394f
changes
muzamilw Aug 16, 2021
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
Prev Previous commit
Next Next commit
Abuzar changes ... comitted by mz on 14 august 2017
  • Loading branch information
shanabuzar committed Aug 14, 2017
commit 7068394b7c66a7b5b20731ef64e2d06d4df8700c
2 changes: 2 additions & 0 deletions SMD.Web/Areas/Ads/Scripts/ads.model.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@
tname = 'Flyer';
else if (Type() == 4)
tname = 'Game';
else if (Type() == 5)
tname = 'Email';
return tname;
}),
DisplayTitle = ko.observable(DisplayTitle).extend({ // custom message
Expand Down
124 changes: 86 additions & 38 deletions SMD.Web/Areas/Ads/Scripts/ads.viewModel.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ define("ads/ads.viewModel",
StatusCodeImage = ko.observable(''),
IsvideoBtn = ko.observable(false),
IsGameAds = ko.observable(false),
IsEmailBtn = ko.observable(false),
countoryidList = [],
cityidList = [],
langidList = [],
Expand Down Expand Up @@ -72,6 +73,8 @@ define("ads/ads.viewModel",
headText = ko.observable(),
//caption variablels
lblCampaignName = ko.observable("Campaign Name"),
PPRlable = ko.observable("PPR"),
budgetText = ko.observable("Daily budget"),
Modelheading = ko.observable(""),
lblDetailsHeading = ko.observable("Free Display Ad Details"),
lblAdTitle = ko.observable("Ad Title"),
Expand Down Expand Up @@ -181,7 +184,7 @@ define("ads/ads.viewModel",
ByProfessionStatsChartAnalyticsData = ko.observableArray([]),
ByAgeStatsChartAnalyticsData = ko.observableArray([]),


PieChartValue = ko.observableArray([0, 0]),
PieChartlabel = ko.observableArray(["", ""]),
CampaignRatioData = ko.observable({
Expand Down Expand Up @@ -451,7 +454,7 @@ define("ads/ads.viewModel",
ByGenderStatsChartAnalyticsData.removeAll();
ko.utils.arrayPushAll(ByGenderStatsChartAnalyticsData(), data.ByGenderStats);
ByGenderStatsChartAnalyticsData.valueHasMutated();

PieChartValue.removeAll();
PieChartlabel.removeAll();
for (var i = 0; i < data.pieCharts.length; i++) {
Expand Down Expand Up @@ -557,10 +560,9 @@ define("ads/ads.viewModel",


},
onDeliveryChange = function ()
{

if(campaignModel().isAdDelivery()==1)
onDeliveryChange = function () {

if (campaignModel().isAdDelivery() == 1)
isPPRVisible(false);
else
isPPRVisible(true);
Expand Down Expand Up @@ -773,7 +775,7 @@ define("ads/ads.viewModel",
// Add new Profile Question

addNewCampaign = function () {

IsthisEditCamapiagn(false);
$("#ddTextBtns").val(0);
BuyItStatus(false);
Expand All @@ -799,7 +801,7 @@ define("ads/ads.viewModel",
$("#Heading_div, #headdesc").css("display", "none");
$(".closecls").css("display", "none");


collapseMainMenu();
TodisplayImg(true);
openEditScreen(1);
Expand All @@ -812,6 +814,9 @@ define("ads/ads.viewModel",
VideoLink2src(0);
FlagToShowDivs(false);
campaignModel().StatusValue('Draft');
if (mode == 5) {
lblAdTitle("Subject Line");
}
isvideobtnvisible(true);
VideoLink2src(null);
isShowArchiveBtn(false);
Expand All @@ -835,10 +840,21 @@ define("ads/ads.viewModel",
campaignModel().ClickRate("0.04");
}

else {//video ad
// campaignModel().CampaignName("New Video Ads");
$("#logo_div").css("display", "none");
campaignModel().ClickRate("0.08");
else {

if (mode == 5) {
$("#logo_div").css("display", "block");
campaignModel().ClickRate("0.02");
campaignModel().isAdDelivery('2');
isPPRVisible(true);

}
else {
//video ad
// campaignModel().CampaignName("New Video Ads");
$("#logo_div").css("display", "none");
campaignModel().ClickRate("0.08");
}
}
campaignModel().reset();
$("#btnPauseCampaign").css("display", "none");
Expand Down Expand Up @@ -1088,7 +1104,7 @@ define("ads/ads.viewModel",
campaignModel().Type('5');
lblCampaignName("Voucher Name");
lblDetailsHeading("Voucher Display Details");
lblAdTitle("Voucher Title");
lblAdTitle("Subject Line");
lblFirstLine("First line");
lbllSecondLine("Second Line");
lblCampaignSchedule("Schedule");
Expand Down Expand Up @@ -1146,7 +1162,7 @@ define("ads/ads.viewModel",
UserAndCostDetail().isStripeIntegrated = true;
saveCampaign(2);
}, 2000, 'Enter your details');

},

submitCampaignData = function () {
Expand Down Expand Up @@ -1314,7 +1330,7 @@ define("ads/ads.viewModel",
else {
saveCampaign(2);
}

}
}
}
Expand Down Expand Up @@ -2378,7 +2394,7 @@ define("ads/ads.viewModel",

var clonedVersofCariterias = data.Campaigns[0].AdCampaignTargetCriterias.clone();


_.each(data.Campaigns[0].CouponCodes, function (cc) {

allCouponCodeItems.push(cc.Code);
Expand Down Expand Up @@ -2785,7 +2801,7 @@ define("ads/ads.viewModel",

lblCampaignName("Voucher Name");
lblDetailsHeading("voucher Display Details");
lblAdTitle("Voucher Title");
lblAdTitle("Subject Line");
lblFirstLine("First line");
lbllSecondLine("Second Line");
lblCampaignSchedule("Schedule");
Expand All @@ -2800,8 +2816,13 @@ define("ads/ads.viewModel",
}

else {
if (mode == 5) {
$("#logo_div").css("display", "block");
}
else {

$("#logo_div").css("display", "none");
$("#logo_div").css("display", "none");
}
}

$.unblockUI(spinner);
Expand Down Expand Up @@ -3953,23 +3974,47 @@ define("ads/ads.viewModel",
videoAdbtnLabel("Get Free Display Ad Credits");
StatusCodeImage("/Content/Images/Displaymod.png");
IsvideoBtn(false);
IsEmailBtn(false);
IsGameAds(true);
CampaignHeader('( Display Ad )');
CampaignHeader('New Display Ad ');
IsNewVideoCampaign(false);
headText("Display Ads");
PPRlable("PPR");
budgetText("Daily budget");
}
else {
UrlHeadings("Call for Action Button");
IsShownforVideo(true);
videoAdbtnLabel("Get Free Video Ad Credits");
VideoImage(true);
IsvideoBtn(true);
IsGameAds(false);
StatusCodeName("Display");
headText("Video Ads");
CampaignHeader("");
StatusCodeImage("/Content/Images/Videomod.png");
IsNewVideoCampaign(true);
if (mode == 1) {
UrlHeadings("Call for Action Button");
IsShownforVideo(true);
videoAdbtnLabel("Get Free Video Ad Credits");
VideoImage(true);
IsvideoBtn(true);
IsEmailBtn(false);
IsGameAds(false);
StatusCodeName("Display");
headText("Video Ads");
CampaignHeader("New Video Campaign");
StatusCodeImage("/Content/Images/Videomod.png");
IsNewVideoCampaign(true);
PPRlable("PPR");
budgetText("Daily budget");
}
else {
UrlHeadings("Call for Action Button");
IsShownforVideo(true);
videoAdbtnLabel("Get Free Video Ad Credits");
VideoImage(true);
IsEmailBtn(true);
IsGameAds(false);
StatusCodeName("Display");
headText("Email Promotion");
CampaignHeader("New Email Campaign");
StatusCodeImage("/Images/email_Imagewhite.png");
IsNewVideoCampaign(true);
PPRlable("Price per email");
budgetText("Total budget");

}
}
view = specifiedView;
ko.applyBindings(view.viewModel, view.bindingRoot);
Expand Down Expand Up @@ -4095,6 +4140,8 @@ define("ads/ads.viewModel",
tab1Heading: tab1Heading,
tab2Heading: tab2Heading,
tab4SubHeading: tab4SubHeading,
PPRlable: PPRlable,
budgetText:budgetText,

gotoProfile: gotoProfile,
gotoManageUsers: gotoManageUsers,
Expand Down Expand Up @@ -4194,6 +4241,7 @@ define("ads/ads.viewModel",
StatusCodeName: StatusCodeName,
StatusCodeImage: StatusCodeImage,
IsvideoBtn: IsvideoBtn,
IsEmailBtn: IsEmailBtn,
IsGameAds: IsGameAds,
CampaignHeader: CampaignHeader,
IsthisEditCamapiagn: IsthisEditCamapiagn,
Expand Down Expand Up @@ -4249,14 +4297,14 @@ define("ads/ads.viewModel",
QQPStatsAnalytics: QQPStatsAnalytics,
getQQPAnalytic: getQQPAnalytic,
onDeliveryChange: onDeliveryChange,
ByGenderStatsChartAnalyticsData : ByGenderStatsChartAnalyticsData,
ByProfessionStatsChartAnalyticsData : ByProfessionStatsChartAnalyticsData,
ByGenderStatsChartAnalyticsData: ByGenderStatsChartAnalyticsData,
ByProfessionStatsChartAnalyticsData: ByProfessionStatsChartAnalyticsData,
ByAgeStatsChartAnalyticsData: ByAgeStatsChartAnalyticsData,
isPPRVisible: isPPRVisible,
videoAdbtnLabel: videoAdbtnLabel,
isvideobtnvisible:isvideobtnvisible
};
})()
};
return ist.Ads.viewModel;
});
isvideobtnvisible: isvideobtnvisible
};
})()
};
return ist.Ads.viewModel;
});
38 changes: 38 additions & 0 deletions SMD.Web/Areas/Ads/Views/Ads/Index.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,9 @@ else
<div class="clearfix text-center" style="padding:20px;padding-bottom:10px;" data-bind="visible:$root.IsvideoBtn()">
<span style="color:white">You haven’t created any Video Ad yet</span>
</div>
<div class="clearfix text-center" style="padding:20px;padding-bottom:10px;" data-bind="visible:$root.IsEmailBtn()">
<span style="color:white">You haven’t created any Email Promotion yet</span>
</div>
</div>
</div>
</div>
Expand All @@ -113,6 +116,7 @@ else
<div class="row">
<span style="font-size:20px;" data-bind="visible:$root.IsGameAds()">Target & reward audiences near you</span>
<span style="font-size:20px;" data-bind="visible:$root.IsvideoBtn()">Target & reward audiences to watch your Video ad</span>
<span style="font-size:20px;" data-bind="visible:$root.IsEmailBtn()">Target & reward audiences to watch your Email Promotion</span>
</div>
<div class="row center">
<img src="/Images/Share_world.png">
Expand All @@ -122,6 +126,7 @@ else
<div class="row" style="padding-bottom:10px;">
<span style="font-size:20px;margin-left:5px;" data-bind="visible:$root.IsGameAds()">Here’s some Display Ads by other advertisers</span>
<span style="font-size:20px;margin-left:5px;" data-bind="visible:$root.IsvideoBtn()">Here’s some Video Ads by other advertisers</span>
<span style="font-size:20px;" data-bind="visible:$root.IsEmailBtn()">Here’s some Email Promotions by other advertisers</span>
</div>
<div class="row center" data-bind="visible:$root.IsGameAds()">
<div class="col-lg-4">
Expand Down Expand Up @@ -164,6 +169,26 @@ else
</div>
</div>
</div>
<div class="row center" data-bind="visible:$root.IsEmailBtn()">
<div class="col-lg-4">
<video id="videoTag" style="width:168px;height:70px;background-color:white" data-bind="attr:{ src:$root.VideoLink1 }"></video>
<div class="main-box no-header clearfix text-center" style="padding:8px;margin-top:1px;">
<span style="font-size:12px;font-weight:bold" data-bind="text:$root.CampaignName1"></span>
</div>
</div>
<div class="col-lg-4">
<video id="videoTag" style="width:168px;height:70px;background-color:white" data-bind="attr:{ src:$root.VideoLink2 }"></video>
<div class="main-box no-header clearfix text-center" style="padding:8px;margin-top:-4px;">
<span style="font-size:12px;font-weight:bold" data-bind="text:$root.CampaignName2"></span>
</div>
</div>
<div class="col-lg-4">
<video id="videoTag" style="width:168px;height:70px;background-color:white" data-bind="attr:{ src:$root.VideoLink3 }"></video>
<div class="main-box no-header clearfix text-center" style="padding:8px;margin-top:-4px;">
<span style="font-size:12px;font-weight:bold" data-bind="text:$root.CampaignName3"></span>
</div>
</div>
</div>

<div class="row" style="padding-top:0px;padding-left:8px;padding-bottom:16px;">
<a href="http://cash4ads.com/" target="_blank">
Expand All @@ -176,6 +201,7 @@ else
<div class="row" style="padding-bottom:10px;">
<span style="font-size:20px;" data-bind="visible:$root.IsGameAds()">Get more Click-thrus to your landing pages</span>
<span style="font-size:20px;" data-bind="visible:$root.IsvideoBtn()">Ask an Insight question</span>
<span style="font-size:20px;" data-bind="visible:$root.IsEmailBtn()">Ask an Insight question</span>
</div>
<div class="row">
<div class="form-group">
Expand All @@ -191,6 +217,12 @@ else
<li>Ask an Insight question and use the result to refine future targeting</li>
<li>Reward audiences with 50% of your PPCV to watch ad and answer survey</li>
</ul>
<ul style="list-style-type:circle;margin-left:17px;" data-bind="visible:$root.IsEmailBtn()">
<li>Target audiences near you</li>
<li>Upload a 30 sec Video ad / TV commercial</li>
<li>Ask an Insight question and use the result to refine future targeting</li>
<li>Reward audiences with 50% of your PPCV to watch ad and answer survey</li>
</ul>
</div>
</div>
<div class="row" style="padding-bottom:30px;margin-top:19px;">
Expand Down Expand Up @@ -461,6 +493,7 @@ else
<div class="col-sm-4 filterbloclkspos" style="float:left;font-size: 20px;margin-top:6px;">
<span data-bind="visible:$root.IsGameAds()">Sponsor a brain training game !</span>
<span data-bind="visible:$root.IsvideoBtn()">Target Audiences with a Video Ad !</span>
<span data-bind="visible:$root.IsEmailBtn()">Target Audiences with a Email Promotion !</span>
</div>

<div class="col-sm-1">
Expand All @@ -481,6 +514,11 @@ else
Create Display Ad
</button>
</div>
<div data-bind="visible:$root.IsEmailBtn()">
<button class="btn btn-primary email_promotion_btn" style="background-color:#37c675!important;border-color:#37c675!important;" data-bind="click:$root.addNewCampaign,visible:!$root.isDisplayCouponsAds()">
Create Email Promotion
</button>
</div>
@*<button class="btn btn-primary" style="display:none;" data-bind="click:$root.addNewCampaign,visible:$root.isDisplayCouponsAds()">
Create Coupon
</button>*@
Expand Down
Loading