diff --git a/.gitmodules b/.gitmodules index f69a7d4e..8a29b0a8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "modules/lnApp"] path = modules/lnApp url = ssh://10.1.3.20/afs/local/git/lnapp +[submodule "modules/highchart"] + path = modules/highchart + url = ssh://10.1.3.20/afs/local/git/lnhighchart diff --git a/modules/adsl/views/adsl/admin/edit.php b/modules/adsl/views/adsl/admin/edit.php new file mode 100644 index 00000000..43763fbf --- /dev/null +++ b/modules/adsl/views/adsl/admin/edit.php @@ -0,0 +1,128 @@ +
+
+
+
+ base_down_peak,array('label'=>'Base Down Peak','class'=>'span1')); ?> +
+
+ extra_down_peak,array('label'=>'Extra','class'=>'span1')); ?> +
+
+ +
+
+ base_down_offpeak,array('label'=>'Base Down Off Peak','class'=>'span1')); ?> +
+
+ extra_down_offpeak,array('label'=>'Extra','class'=>'span1')); ?> +
+
+ +
+
+ base_up_peak,array('label'=>'Base Up Peak','class'=>'span1')); ?> +
+
+ extra_up_peak,array('label'=>'Extra','class'=>'span1')); ?> +
+
+ +
+
+ base_up_offpeak,array('label'=>'Base Up Off Peak','class'=>'span1')); ?> +
+
+ extra_up_offpeak,array('label'=>'Extra','class'=>'span1')); ?> +
+
+ +
+
+ contract_term,array('label'=>'Contract Term','class'=>'span1')); ?> +
+
+ +
+
+ extra_charged,FALSE,array('label'=>'Extra Charged','class'=>'span1')); ?> +
+
+ +
+
+ list_select(),$o->adsl_supplier_plan_id,array('label'=>'Supplier Plan')); ?> +
+
+ +
+
+ + +
+
+
+ +
+
+ Supplier Details +
+
Supplier
+
supplier_plan->supplier->name; ?>
+ +
Allowance
+
allowance($o->supplier_plan->traffic_data(),TRUE); ?>
+ +
Cost
+
supplier_plan->display('base_cost'); ?>
+ +
Excess
+
supplier_plan->cost_extra($o->allowance($o->supplier_plan->traffic_data()),TRUE); ?>
+ +
Speed
+
supplier_plan->speed; ?>
+
+
+
+ +
+
+ Test Traffic +
+
+ 'Down Peak','class'=>'span1')); ?> +
+
+ 'Offpeak','class'=>'span1')); ?> +
+
+
+
+ 'Up Peak','class'=>'span1')); ?> +
+
+ 'Offpeak','class'=>'span1')); ?> +
+
+
+
+ 'Charges','class'=>'span1')); ?> +
+
+
+ + +
+ Test Traffic Result +
+ $v) : ?> +
+
+ + +
Has Offpeak?
+
hasOffpeak(); ?>
+
+
+ +
+
diff --git a/modules/highchart b/modules/highchart new file mode 160000 index 00000000..9ed797b1 --- /dev/null +++ b/modules/highchart @@ -0,0 +1 @@ +Subproject commit 9ed797b1d2e9a2b3b8227bbb42be01ea620916d4 diff --git a/modules/lnApp b/modules/lnApp index c014a4ce..610c223c 160000 --- a/modules/lnApp +++ b/modules/lnApp @@ -1 +1 @@ -Subproject commit c014a4cec843a37c14cb77b2d453909b8ca6494e +Subproject commit 610c223cb823f2b16df3e1f49912e8ef42dc6bd7