Subversion Repositories SmartDukaan

Rev

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

Rev 4421 Rev 4455
Line 333... Line 333...
333
	    } else {
333
	    } else {
334
	    	flagOrder.setText("Flag");
334
	    	flagOrder.setText("Flag");
335
	    }
335
	    }
336
	    
336
	    
337
	    requestPickup.setText("Request Pick-up No");
337
	    requestPickup.setText("Request Pick-up No");
338
	    authorizePickup.setText("Authorize Pick-up");
338
	    authorizePickup.setText("Confirm Pick-up");
339
	    reshipOrder.setText("Reship");
339
	    reshipOrder.setText("Reship");
340
	    refundOrder.setText("Refund");
340
	    refundOrder.setText("Refund");
341
	    provisionallyCapturePaymentForOrder.setText("Capture payment provisionally");
341
	    provisionallyCapturePaymentForOrder.setText("Capture payment provisionally");
342
	    
342
	    
343
	    header.setWidget(1, 0, flagOrder);
343
	    header.setWidget(1, 0, flagOrder);
Line 485... Line 485...
485
        case ACCEPT:
485
        case ACCEPT:
486
        case BILL:
486
        case BILL:
487
			maskButtonsForAdmin(false, false, false, false, true, true, false); //Allow the OM to refund a COD order or an order with low inventory or when a customer calls or writes to cancel an order.
487
			maskButtonsForAdmin(false, false, false, false, true, true, false); //Allow the OM to refund a COD order or an order with low inventory or when a customer calls or writes to cancel an order.
488
			break;
488
			break;
489
		case DELIVERED:
489
		case DELIVERED:
-
 
490
			maskButtonsForAdmin(false, false, false, false, false, true, false);	//Allow the OM to flag and request pickup.
-
 
491
			break;
-
 
492
		case DOA_REQUEST_AUTHORIZED:	
490
			maskButtonsForAdmin(true, true, false, false, false, true, false);	//Allow the OM to flag and request pickup.
493
			maskButtonsForAdmin(true, true, false, false, false, true, false);	//Allow the OM to flag and request pickup.
491
			break;
494
			break;
492
		case DOA_PICKUP_REQUESTED:
495
		case DOA_PICKUP_REQUESTED:
493
			maskButtonsForAdmin(true, true, true, false, false, true, false);	//Allow the OM to either re-request a pickup no. or authorize pickup by entering one
496
			maskButtonsForAdmin(true, true, true, false, false, true, false);	//Allow the OM to either re-request a pickup no. or authorize pickup by entering one
494
			break;
497
			break;