Subversion Repositories SmartDukaan

Rev

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

Rev 4682 Rev 4712
Line 83... Line 83...
83
	
83
	
84
	//Buttons for the Admin to edit order details
84
	//Buttons for the Admin to edit order details
85
	private Button addWeight = new Button();
85
	private Button addWeight = new Button();
86
	private Button changeColor = new Button();
86
	private Button changeColor = new Button();
87
	private Button addDelayReason = new Button();
87
	private Button addDelayReason = new Button();
-
 
88
	private Button markDelivered = new Button();
88
	private Button shiftWarehouse = new Button();
89
	private Button shiftWarehouse = new Button();
89
	
90
	
90
	private String user;
91
	private String user;
91
	private DetailsMask mask;
92
	private DetailsMask mask;
92
	private long warehouseID;
93
	private long warehouseID;
Line 374... Line 375...
374
	    header.setWidget(1, 6, refundOrder);
375
	    header.setWidget(1, 6, refundOrder);
375
	    
376
	    
376
	    addWeight.setText("Add weight");
377
	    addWeight.setText("Add weight");
377
	    changeColor.setText("Change Color");
378
	    changeColor.setText("Change Color");
378
	    addDelayReason.setText("Add Delay Reason");
379
	    addDelayReason.setText("Add Delay Reason");
-
 
380
	    markDelivered.setText("Mark Delivered");
379
	    shiftWarehouse.setText("Shift Warehouse");
381
	    shiftWarehouse.setText("Shift Warehouse");
380
	    
382
	    
381
	    header.setWidget(2, 0, addWeight);
383
	    header.setWidget(2, 0, addWeight);
382
	    header.setWidget(2, 1, changeColor);
384
	    header.setWidget(2, 1, changeColor);
383
	    header.setWidget(2, 2, addDelayReason);
385
	    header.setWidget(2, 2, addDelayReason);
-
 
386
	    header.setWidget(2, 3, markDelivered);
384
	    header.setWidget(2, 6, shiftWarehouse);
387
	    header.setWidget(2, 6, shiftWarehouse);
385
	    
388
	    
386
	    if(order.getTotalWeight() != 0)
389
	    if(order.getTotalWeight() != 0)
387
	        addWeight.setEnabled(false);
390
	        addWeight.setEnabled(false);
388
	    
391
	    
Line 498... Line 501...
498
                AddDelayReasonBox box = new AddDelayReasonBox(eventbus, order);
501
                AddDelayReasonBox box = new AddDelayReasonBox(eventbus, order);
499
                box.center();
502
                box.center();
500
            }
503
            }
501
        });
504
        });
502
		
505
		
-
 
506
		markDelivered.addClickHandler(new ClickHandler() {
-
 
507
            
-
 
508
            @Override
-
 
509
            public void onClick(ClickEvent event) {
-
 
510
                MarkDeliveredBox box = new MarkDeliveredBox(eventbus, order);
-
 
511
                box.center();
-
 
512
            }
-
 
513
        });
-
 
514
 
503
		shiftWarehouse.addClickHandler(new ClickHandler() {
515
		shiftWarehouse.addClickHandler(new ClickHandler() {
504
            
516
            
505
            @Override
517
            @Override
506
            public void onClick(ClickEvent event) {
518
            public void onClick(ClickEvent event) {
507
                if(shiftWarehouse.isEnabled()){
519
                if(shiftWarehouse.isEnabled()){