sipwise
/
www_csc
mirror of https://github.com/sipwise/www_csc.git
1
0
Fork 0
Code Issues Releases Wiki Activity

changed page order in order process for hw shop integration

Browse Source
2.0@2770
Daniel Tiefnig 17 years ago
parent 2d2ede303b
commit 2ba4a46528
9 changed files with 132 additions and 118 deletions
Show Stats Download Patch File Download Diff File

3
lib/csc/Controller/payment.pm
Unescape View File

@ -41,6 +41,9 @@ sub index : Private {
$c->stash->{phones} = $c->session->{shop}{phones};
$c->stash->{price_sum} = $c->session->{shop}{price_sum};
$c->stash->{tarif} = $c->session->{shop}{tarif};
$c->stash->{number} = '0'. $c->session->{shop}{number}{ac} .' '. $c->session->{shop}{number}{sn};
return 1;
}

157
lib/csc/Controller/shop.pm
Unescape View File

@ -224,66 +224,6 @@ sub set_extensions : Local {
$c->session->{shop}{extensions} = $c->request->params->{extensions};
$c->response->redirect('/shop/tarif?sk='. $c->session->{shop}{session_key});
}
=head2 tarif
=cut
sub tarif : Local {
my ( $self, $c ) = @_;
$c->response->redirect('http://www.libratel.at/')
unless defined $c->request->params->{sk} and
$c->request->params->{sk} eq $c->session->{shop}{session_key};
$c->stash->{template} = 'tt/shop/tarif.tt';
$c->stash->{sk} = $c->session->{shop}{session_key};
my $products;
return unless $c->model('Provisioning')->call_prov( $c, 'billing', 'get_products',
undef,
\$products,
);
$c->session->{shop}{dbproducts} = $$products{result};
# foreach my $product (@{$c->session->{shop}{dbproducts}}) {
# next unless $$product{class} eq 'voip';
# $c->stash->{products}{$$product{name}} = $product;
# }
return 1;
}
=head2 set_tarif
=cut
sub set_tarif : Local {
my ( $self, $c ) = @_;
$c->response->redirect('http://www.libratel.at/')
unless defined $c->request->params->{sk} and
$c->request->params->{sk} eq $c->session->{shop}{session_key};
foreach my $product (@{$c->session->{shop}{dbprodarray}}) {
next unless $$product{name} eq $c->request->params->{tarif};
delete $c->session->{shop}{tarif} if exists $c->session->{shop}{tarif};
$c->session->{shop}{tarif}{name} = $c->request->params->{tarif};
$c->session->{shop}{tarif}{price} = sprintf "%.2f", $$product{price} / 100;
if(defined $$product{billing_profile}) {
my $bilprof;
return unless $c->model('Provisioning')->call_prov( $c, 'billing', 'get_billing_profile',
{ billing_profile => $$product{billing_profile} },
\$bilprof,
);
$c->session->{shop}{tarif}{monthly} = sprintf "%.2f", $$bilprof{interval_charge} / 100;
} else {
$c->session->{shop}{tarif}{monthly} = 0;
}
$c->session->{shop}{tarif}{initial_charge} = sprintf "%.2f", 10;
}
$c->response->redirect('/shop/system?sk='. $c->session->{shop}{session_key});
}
@ -302,6 +242,9 @@ sub system : Local {
$c->stash->{sk} = $c->session->{shop}{session_key};
$c->stash->{tarif} = $c->session->{shop}{tarif};
$c->stash->{extensions} = $c->session->{shop}{extensions};
$self->_load_products($c) or return;
foreach my $product (@{$c->session->{shop}{dbprodarray}}) {
next unless $$product{class} eq 'hardware';
my $name = $$product{name};
@ -450,12 +393,72 @@ sub set_system : Local {
$c->session->{messages} = \%messages;
$c->response->redirect('/shop/system?sk='. $c->session->{shop}{session_key});
} else {
$c->response->redirect('/shop/personal?sk='. $c->session->{shop}{session_key});
$c->response->redirect('/shop/tarif?sk='. $c->session->{shop}{session_key});
}
return 0;
}
=head2 tarif
=cut
sub tarif : Local {
my ( $self, $c ) = @_;
$c->response->redirect('http://www.libratel.at/')
unless defined $c->request->params->{sk} and
$c->request->params->{sk} eq $c->session->{shop}{session_key};
$c->stash->{template} = 'tt/shop/tarif.tt';
$c->stash->{sk} = $c->session->{shop}{session_key};
my $products;
return unless $c->model('Provisioning')->call_prov( $c, 'billing', 'get_products',
undef,
\$products,
);
$c->session->{shop}{dbproducts} = $$products{result};
# foreach my $product (@{$c->session->{shop}{dbproducts}}) {
# next unless $$product{class} eq 'voip';
# $c->stash->{products}{$$product{name}} = $product;
# }
return 1;
}
=head2 set_tarif
=cut
sub set_tarif : Local {
my ( $self, $c ) = @_;
$c->response->redirect('http://www.libratel.at/')
unless defined $c->request->params->{sk} and
$c->request->params->{sk} eq $c->session->{shop}{session_key};
foreach my $product (@{$c->session->{shop}{dbprodarray}}) {
next unless $$product{name} eq $c->request->params->{tarif};
delete $c->session->{shop}{tarif} if exists $c->session->{shop}{tarif};
$c->session->{shop}{tarif}{name} = $c->request->params->{tarif};
$c->session->{shop}{tarif}{price} = sprintf "%.2f", $$product{price} / 100;
if(defined $$product{billing_profile}) {
my $bilprof;
return unless $c->model('Provisioning')->call_prov( $c, 'billing', 'get_billing_profile',
{ billing_profile => $$product{billing_profile} },
\$bilprof,
);
$c->session->{shop}{tarif}{monthly} = sprintf "%.2f", $$bilprof{interval_charge} / 100;
} else {
$c->session->{shop}{tarif}{monthly} = 0;
}
$c->session->{shop}{tarif}{initial_charge} = sprintf "%.2f", 10;
}
$c->response->redirect('/shop/personal?sk='. $c->session->{shop}{session_key});
}
=head2 personal
=cut
@ -641,21 +644,23 @@ sub set_personal : Local {
if(!defined $settings{username} or length $settings{username} == 0) {
$messages{msgusername} = 'Client.Syntax.MissingUsername';
}
my $checkresult;
return unless $c->model('Provisioning')->call_prov($c, 'voip', 'check_username',
$settings{username}, \$checkresult);
$messages{msgusername} = 'Client.Syntax.MalformedUsername'
unless $checkresult;
if($c->model('Provisioning')->call_prov($c, 'voip', 'get_subscriber',
{ username => $settings{username},
domain => $c->config->{site_domain},
}))
{
$messages{msgusername} = 'Client.Voip.ExistingSubscriber';
} elsif($c->session->{prov_error} eq 'Client.Voip.NoSuchSubscriber') {
delete $c->session->{prov_error};
} else {
return;
unless($messages{msgusername}) {
my $checkresult;
return unless $c->model('Provisioning')->call_prov($c, 'voip', 'check_username',
$settings{username}, \$checkresult);
$messages{msgusername} = 'Client.Syntax.MalformedUsername'
unless $checkresult;
if($c->model('Provisioning')->call_prov($c, 'voip', 'get_subscriber',
{ username => $settings{username},
domain => $c->config->{site_domain},
}))
{
$messages{msgusername} = 'Client.Voip.ExistingSubscriber';
} elsif($c->session->{prov_error} eq 'Client.Voip.NoSuchSubscriber') {
delete $c->session->{prov_error};
} else {
return;
}
}
my $passwd1 = $c->request->params->{fpasswort1};

14
root/tt/shop/finish.tt
Unescape View File

@ -248,12 +248,6 @@
<ul class="schritte">
<li class="ok">
<strong>Schritt 1:</strong><br />
Tarifauswahl<br />
<span class="okprodtext">[% tarif.name %]</span>
<br clear="all" />
</li>
<li class="ok">
<strong>Schritt 2:</strong><br />
System und Endgeräte<br />
[% IF system.name %]
<strong class="okprodcount">1x</strong>
@ -268,6 +262,12 @@
<br clear="all" />
[% END %]
</li>
<li class="ok">
<strong>Schritt 2:</strong><br />
Tarifauswahl<br />
<span class="okprodtext">[% tarif.name %]</span>
<br clear="all" />
</li>
<li class="ok">
<strong>Schritt 3:</strong><br />
Persönliche Daten
@ -275,6 +275,8 @@
<li class="ok">
<strong>Schritt 4:</strong><br />
Runfnummer wählen
<span class="okprodtext">[% number %]</span>
<br clear="all" />
</li>
<li class="ok">
<strong>Schritt 5:</strong><br />

12
root/tt/shop/number.tt
Unescape View File

@ -70,12 +70,6 @@
<ul class="schritte">
<li class="ok">
<strong>Schritt 1:</strong><br />
Tarifauswahl<br />
<span class="okprodtext">[% tarif.name %]</span>
<br clear="all" />
</li>
<li class="ok">
<strong>Schritt 2:</strong><br />
System und Endgeräte<br />
[% IF system.name %]
<strong class="okprodcount">1x</strong>
@ -90,6 +84,12 @@
<br clear="all" />
[% END %]
</li>
<li class="ok">
<strong>Schritt 2:</strong><br />
Tarifauswahl<br />
<span class="okprodtext">[% tarif.name %]</span>
<br clear="all" />
</li>
<li class="ok">
<strong>Schritt 3:</strong><br />
Persönliche Daten

14
root/tt/shop/overview.tt
Unescape View File

@ -263,12 +263,6 @@
<ul class="schritte">
<li class="ok">
<strong>Schritt 1:</strong><br />
Tarifauswahl<br />
<span class="okprodtext">[% tarif.name %]</span>
<br clear="all" />
</li>
<li class="ok">
<strong>Schritt 2:</strong><br />
System und Endgeräte<br />
[% IF system.name %]
<strong class="okprodcount">1x</strong>
@ -283,6 +277,12 @@
<br clear="all" />
[% END %]
</li>
<li class="ok">
<strong>Schritt 2:</strong><br />
Tarifauswahl
<span class="okprodtext">[% tarif.name %]</span>
<br clear="all" />
</li>
<li class="ok">
<strong>Schritt 3:</strong><br />
Persönliche Daten
@ -290,6 +290,8 @@
<li class="ok">
<strong>Schritt 4:</strong><br />
Runfnummer wählen
<span class="okprodtext">[% number %]</span>
<br clear="all" />
</li>
<li class="on">
<strong>Schritt 5:</strong><br />

14
root/tt/shop/payment_select.tt
Unescape View File

@ -35,12 +35,6 @@
<ul class="schritte">
<li class="ok">
<strong>Schritt 1:</strong><br />
Tarifauswahl<br />
<span class="okprodtext">[% tarif.name %]</span>
<br clear="all" />
</li>
<li class="ok">
<strong>Schritt 2:</strong><br />
System und Endgeräte<br />
[% IF system.name %]
<strong class="okprodcount">1x</strong>
@ -55,6 +49,12 @@
<br clear="all" />
[% END %]
</li>
<li class="ok">
<strong>Schritt 2:</strong><br />
Tarifauswahl
<span class="okprodtext">[% tarif.name %]</span>
<br clear="all" />
</li>
<li class="ok">
<strong>Schritt 3:</strong><br />
Persönliche Daten
@ -62,6 +62,8 @@
<li class="ok">
<strong>Schritt 4:</strong><br />
Runfnummer wählen
<span class="okprodtext">[% number %]</span>
<br clear="all" />
</li>
<li class="on">
<strong>Schritt 5:</strong><br />

12
root/tt/shop/personal.tt
Unescape View File

@ -289,12 +289,6 @@
<ul class="schritte">
<li class="ok">
<strong>Schritt 1:</strong><br />
Tarifauswahl<br />
<span class="okprodtext">[% tarif.name %]</span>
<br clear="all" />
</li>
<li class="ok">
<strong>Schritt 2:</strong><br />
System und Endgeräte<br />
[% IF system.name %]
<strong class="okprodcount">1x</strong>
@ -309,6 +303,12 @@
<br clear="all" />
[% END %]
</li>
<li class="ok">
<strong>Schritt 2:</strong><br />
Tarifauswahl<br />
<span class="okprodtext">[% tarif.name %]</span>
<br clear="all" />
</li>
<li class="on">
<strong>Schritt 3:</strong><br />
Persönliche Daten

10
root/tt/shop/system.tt
Unescape View File

@ -297,15 +297,13 @@
</p>
<ul class="schritte">
<li class="ok">
<li class="on">
<strong>Schritt 1:</strong><br />
Tarifauswahl<br />
<span class="okprodtext">[% tarif.name %]</span>
<br clear="all" />
System und Endgeräte<br />
</li>
<li class="on">
<li>
<strong>Schritt 2:</strong><br />
System und Endgeräte<br />
Tarifauswahl<br />
</li>
<li>
<strong>Schritt 3:</strong><br />

14
root/tt/shop/tarif.tt
Unescape View File

@ -92,15 +92,17 @@
</p>
<ul class="schritte">
<li class="on">
<li class="ok">
<strong>Schritt 1:</strong><br />
Tarifauswahl<br />
<span class="okprodtext">[% tarif.name %]</span>
<br clear="all" />
System und Endgeräte<br />
</li>
<li>
<li class="on">
<strong>Schritt 2:</strong><br />
System und Endgeräte<br />
Tarifauswahl<br />
[% IF tarif.name %]
<span class="okprodtext">[% tarif.name %]</span>
<br clear="all" />
[% END %]
</li>
<li>
<strong>Schritt 3:</strong><br />

Write Preview
Loading…
Cancel
Save