Subversion Repositories SmartDukaan

Rev

Rev 25740 | Rev 26140 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 25740 Rev 26063
Line 380... Line 380...
380 
	return otherNumbers.replace(/\B(?=(\d{2})+(?!\d))/g, ",") + (lastThree)
 380 
	return otherNumbers.replace(/\B(?=(\d{2})+(?!\d))/g, ",") + (lastThree)
381 
			+ x2;
 381 
			+ x2;
382 
 
 382 
 
383 
}
 383 
}
384 
 
 384 
 
- 
 
 385 
function reporticoDRCallback(start, end) {
- 
 
 386 
	startMoment = start;
- 
 
 387 
	endMoment = end;
- 
 
 388 
	startDate = start.format(moment.HTML5_FMT.DATE);
- 
 
 389 
	endDate = end.format(moment.HTML5_FMT.DATE);
- 
 
 390 
}
- 
 
 391 
//Custom formatters should be handled specifically at the controller side
385 
function dateRangeCallback(start, end) {
 392 
function dateRangeCallback(start, end) {
386 
	startMoment = start;
 393 
	startMoment = start;
387 
	endMoment = end;
 394 
	endMoment = end;
388 
	startDate = start.format(moment.HTML5_FMT.DATETIME_LOCAL_SECONDS);
 395 
	startDate = start.format(moment.HTML5_FMT.DATETIME_LOCAL_SECONDS);
389 
	endDate = end.format(moment.HTML5_FMT.DATETIME_LOCAL_SECONDS);
 396 
	endDate = end.format(moment.HTML5_FMT.DATETIME_LOCAL_SECONDS);
Line 426... Line 433...
426 
					moment().subtract(1, 'days') ],
 433 
					moment().subtract(1, 'days') ],
427 
			'Last 7 Days' : [ moment().subtract(6, 'days'), moment() ],
 434 
			'Last 7 Days' : [ moment().subtract(6, 'days'), moment() ],
428 
			'Last 30 Days' : [ moment().subtract(29, 'days'), moment() ],
 435 
			'Last 30 Days' : [ moment().subtract(29, 'days'), moment() ],
429 
			'This Month' : [ moment().startOf('month'), moment().endOf('month') ],
 436 
			'This Month' : [ moment().startOf('month'), moment().endOf('month') ],
430 
			'Last Month' : [ moment().subtract(1, 'month').startOf('month'),
 437 
			'Last Month' : [ moment().subtract(1, 'month').startOf('month'),
431 
					moment().subtract(1, 'month').endOf('month') ]
 438 
					moment().subtract(1, 'month').endOf('month') ],
- 
 
 439 
			'Last 3 Months' : [ moment().subtract(1, 'month').startOf('month'),
- 
 
 440 
			moment().subtract(3, 'month').endOf('month') ],
- 
 
 441 
			'Last 6 Months' : [ moment().subtract(1, 'month').startOf('month'),
- 
 
 442 
				moment().subtract(6, 'month').endOf('month') ]
432 
		}
 443 
		}
433 
	}
 444 
	}
434 
	return rangedDatePicker;
 445 
	return rangedDatePicker;
435 
}
 446 
}
436 
function showPosition(position) {
 447 
function showPosition(position) {